Moving tls flag from percona to db group
Change-Id: I75fbcb1274a860154f26b650a55e4bdd9227013a Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340
This commit is contained in:
parent
1f39d95902
commit
41f9deb816
|
@ -14,9 +14,9 @@ service:
|
||||||
command:
|
command:
|
||||||
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.main_database }};
|
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.main_database }};
|
||||||
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
||||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
{% if db.tls.enabled %} require ssl {% endif %};
|
||||||
grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
||||||
{% if percona.tls.enabled %} require ssl {% endif %};"
|
{% if db.tls.enabled %} require ssl {% endif %};"
|
||||||
- name: designate-syncdb
|
- name: designate-syncdb
|
||||||
dependencies:
|
dependencies:
|
||||||
- designate-main-db-create
|
- designate-main-db-create
|
||||||
|
|
|
@ -12,9 +12,9 @@ service:
|
||||||
command:
|
command:
|
||||||
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.pool_manager }};
|
mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.pool_manager }};
|
||||||
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
||||||
{% if percona.tls.enabled %} require ssl {% endif %};
|
{% if db.tls.enabled %} require ssl {% endif %};
|
||||||
grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
|
||||||
{% if percona.tls.enabled %} require ssl {% endif %};"
|
{% if db.tls.enabled %} require ssl {% endif %};"
|
||||||
- name: designate-pool-sync
|
- name: designate-pool-sync
|
||||||
dependencies:
|
dependencies:
|
||||||
- designate-pool-manager-db-create
|
- designate-pool-manager-db-create
|
||||||
|
|
|
@ -108,7 +108,7 @@ pool_id = {{ designate.pool.pool_id }}
|
||||||
# SQLAlchemy Pool Manager Cache
|
# SQLAlchemy Pool Manager Cache
|
||||||
#------------------------------
|
#------------------------------
|
||||||
[pool_manager_cache:sqlalchemy]
|
[pool_manager_cache:sqlalchemy]
|
||||||
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.pool_manager }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||||
|
|
||||||
########################
|
########################
|
||||||
## Storage Configuration
|
## Storage Configuration
|
||||||
|
@ -117,7 +117,7 @@ connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.passwor
|
||||||
# SQLAlchemy Storage
|
# SQLAlchemy Storage
|
||||||
#-------------------
|
#-------------------
|
||||||
[storage:sqlalchemy]
|
[storage:sqlalchemy]
|
||||||
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.main_database }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||||
|
|
||||||
########################
|
########################
|
||||||
## Handler Configuration
|
## Handler Configuration
|
||||||
|
|
Loading…
Reference in New Issue