x
/
fuel-ccp-murano
Code Issues Proposed changes

Moving tls flag from percona to db group 

Change-Id: I3d9a7006748fbb83865fce2c0cc383c113a07982
Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
Andrey Pavlov 2017-02-20 14:28:44 +00:00
parent f94622e2f4
commit f57f1ee329
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/murano.conf.j2
View File

@ -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

4
service/murano-api.yaml
View File

@ -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