diff --git a/service/files/murano.conf.j2 b/service/files/murano.conf.j2 index 51f7a57..b70979c 100644 --- a/service/files/murano.conf.j2 +++ b/service/files/murano.conf.j2 @@ -12,7 +12,7 @@ home_region = RegionOne transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/ [database] -connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{{ address(service.database) }}/{{ murano.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} +connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{{ address(service.database) }}/{{ murano.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} [engine] use_trusts = True diff --git a/service/murano-api.yaml b/service/murano-api.yaml index bf9d528..05a7434 100644 --- a/service/murano-api.yaml +++ b/service/murano-api.yaml @@ -16,9 +16,9 @@ service: type: single command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e 'create database `{{ murano.db.name }}`; create user '{{ murano.db.username }}'@'%' identified by '{{ murano.db.password }}' - {% if percona.tls.enabled %} require ssl {% endif %}; + {% if db.tls.enabled %} require ssl {% endif %}; grant all privileges on `{{ murano.db.name }}`.* to "{{ murano.db.username }}"@"%" identified by "{{ murano.db.password }}" - {% if percona.tls.enabled %} require ssl {% endif %};' + {% if db.tls.enabled %} require ssl {% endif %};' dependencies: - {{ service.database }} - name: murano-db-sync