Better expressions

salt-formulas · Dec 9, 2017 · 628c19e · 628c19e
1 parent 351fee3
commit 628c19e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/keystone/files/ocata/keystone.conf.Debian b/keystone/files/ocata/keystone.conf.Debian
@@ -776,7 +776,7 @@ key_repository = {{ server.credential.location }}
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection = <None>
-connection={%- if server.database.engine == 'mysql' -%}{{ server.database.engine }}+pymysql{%- else -%}{{ server.database.engine }}{%- endif -%}://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}{%- if server.database.get('ssl',{}).get('enabled',False) %}?ssl_ca={{ server.database.ssl.get('cacert_file', system_cacerts_file) }}{% endif %}
+connection={{ server.database.engine }}{%- if server.database.engine == 'mysql' and '+' not in server.database.engine -%}+pymysql{%- endif -%}://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}{%- if server.database.get('ssl',{}).get('enabled',False) %}?ssl_ca={{ server.database.ssl.get('cacert_file', system_cacerts_file) }}{% endif %}
 
 # The SQLAlchemy connection string to use to connect to the slave database.
 # (string value)

diff --git a/keystone/files/ocata/keystone.conf.RedHat b/keystone/files/ocata/keystone.conf.RedHat
@@ -751,7 +751,7 @@ driver = sql
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection = <None>
-connection={%- if server.database.engine == 'mysql' -%}{{ server.database.engine }}+pymysql{%- else -%}{{ server.database.engine }}{%- endif -%}://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}
+connection={{ server.database.engine }}{%- if server.database.engine == 'mysql' and '+' not in server.database.engine -%}+pymysql{%- endif -%}://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}
 
 # The SQLAlchemy connection string to use to connect to the slave database.
 # (string value)