From 41f9deb816d2c2818fbf836d55930e12504896a3 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Mon, 20 Feb 2017 14:35:33 +0000 Subject: [PATCH] Moving tls flag from percona to db group Change-Id: I75fbcb1274a860154f26b650a55e4bdd9227013a Depends-On: I2ff95f7a1cbb14cb1cd9e35677f95c30a4523340 --- service/designate-api.yaml | 4 ++-- service/designate-pool-manager.yaml | 4 ++-- service/files/designate.conf.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/service/designate-api.yaml b/service/designate-api.yaml index 277091b..8e00bcf 100644 --- a/service/designate-api.yaml +++ b/service/designate-api.yaml @@ -14,9 +14,9 @@ service: command: 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 }}' - {% 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 }}' - {% if percona.tls.enabled %} require ssl {% endif %};" + {% if db.tls.enabled %} require ssl {% endif %};" - name: designate-syncdb dependencies: - designate-main-db-create diff --git a/service/designate-pool-manager.yaml b/service/designate-pool-manager.yaml index 1520590..93c1e66 100644 --- a/service/designate-pool-manager.yaml +++ b/service/designate-pool-manager.yaml @@ -12,9 +12,9 @@ service: command: 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 }}' - {% 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 }}' - {% if percona.tls.enabled %} require ssl {% endif %};" + {% if db.tls.enabled %} require ssl {% endif %};" - name: designate-pool-sync dependencies: - designate-pool-manager-db-create diff --git a/service/files/designate.conf.j2 b/service/files/designate.conf.j2 index 3cbd272..d3f05c7 100644 --- a/service/files/designate.conf.j2 +++ b/service/files/designate.conf.j2 @@ -108,7 +108,7 @@ pool_id = {{ designate.pool.pool_id }} # SQLAlchemy Pool Manager Cache #------------------------------ [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 @@ -117,7 +117,7 @@ connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.passwor # SQLAlchemy Storage #------------------- [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