From c476e8284abf11bbf919b1200f19e6b438945ca8 Mon Sep 17 00:00:00 2001 From: "Donovan Francesco (drifterza)" Date: Wed, 16 Nov 2016 16:39:21 +0200 Subject: [PATCH] Updating designate role to align with integrated repo. - Variables for designate_galera_password: - Variables for designate_pool_manager_galera_password: Change-Id: Ieb45a4c9813fe5106afe2c560ff9c19a73b43f72 Closes-Bug: #1641600 --- doc/source/index.rst | 4 ++-- examples/playbook.yml | 4 ++-- extras/user_secrets_designate.yml | 4 ++-- templates/designate.conf.j2 | 4 ++-- tests/os_designate-overrides.yml | 4 ++-- tests/test-install-designate.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 296ae82..4d05470 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -25,8 +25,8 @@ Required variables .. code-block:: yaml designate_galera_address - designate_container_mysql_password - designate_pool_manager_container_mysql_password + designate_galera_password + designate_pool_manager_galera_password designate_service_password designate_rabbitmq_password diff --git a/examples/playbook.yml b/examples/playbook.yml index 5871429..8df4b19 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -7,7 +7,7 @@ external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 designate_galera_address: "{{ internal_lb_vip_address }}" - designate_container_mysql_password: "SuperSecretePassword1" - designate_pool_manager_container_mysql_password: "SuperSecretePassword2" + designate_galera_password: "SuperSecretePassword1" + designate_pool_manager_galera_password: "SuperSecretePassword2" designate_service_password: "SuperSecretePassword3" designate_rabbitmq_password: "SuperSecretePassword4" diff --git a/extras/user_secrets_designate.yml b/extras/user_secrets_designate.yml index 2ce36e5..b67901e 100644 --- a/extras/user_secrets_designate.yml +++ b/extras/user_secrets_designate.yml @@ -1,5 +1,5 @@ -designate_container_mysql_password: -designate_pool_manager_container_mysql_password: +designate_galera_password: +designate_pool_manager_galera_password: designate_pool_nameserver_uuid: designate_pool_target_uuid: designate_pool_uuid: diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index 2b4ca1f..85fe393 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -306,7 +306,7 @@ pool_id = {{ designate_pool_uuid }} # SQLAlchemy Pool Manager Cache #----------------------- [pool_manager_cache:sqlalchemy] -connection = mysql+pymysql://{{ designate_pool_manager_galera_user }}:{{ designate_pool_manager_container_mysql_password }}@{{ designate_pool_manager_galera_address }}/designate_pool_manager?charset=utf8 +connection = mysql+pymysql://{{ designate_pool_manager_galera_user }}:{{ designate_pool_manager_galera_password }}@{{ designate_pool_manager_galera_address }}/designate_pool_manager?charset=utf8 #connection_debug = 100 #connection_trace = False #sqlite_synchronous = True @@ -344,7 +344,7 @@ connection = mysql+pymysql://{{ designate_pool_manager_galera_user }}:{{ designa # SQLAlchemy Storage #----------------------- [storage:sqlalchemy] -connection = mysql+pymysql://{{ designate_galera_user }}:{{ designate_container_mysql_password }}@{{ designate_galera_address }}/designate?charset=utf8 +connection = mysql+pymysql://{{ designate_galera_user }}:{{ designate_galera_password }}@{{ designate_galera_address }}/designate?charset=utf8 #connection_debug = 0 #connection_trace = False #sqlite_synchronous = True diff --git a/tests/os_designate-overrides.yml b/tests/os_designate-overrides.yml index 14f8b76..83897cd 100644 --- a/tests/os_designate-overrides.yml +++ b/tests/os_designate-overrides.yml @@ -22,11 +22,11 @@ designate_service_password: "secrete" designate_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}" designate_galera_database: designate designate_galera_user: designate -designate_container_mysql_password: "SuperSecrete" +designate_galera_password: "SuperSecrete" designate_pool_manager_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}" designate_pool_manager_galera_database: designate_pool_manager designate_pool_manager_galera_user: designate_pool_manager -designate_pool_manager_container_mysql_password: "SuperSecrete" +designate_pool_manager_galera_password: "SuperSecrete" designate_rabbitmq_password: "secrete" designate_rabbitmq_userid: designate designate_rabbitmq_vhost: /designate diff --git a/tests/test-install-designate.yml b/tests/test-install-designate.yml index 7749fba..fc26ead 100644 --- a/tests/test-install-designate.yml +++ b/tests/test-install-designate.yml @@ -50,7 +50,7 @@ login_password: "{{ galera_root_password }}" login_host: "localhost" name: "{{ designate_galera_user }}" - password: "{{ designate_container_mysql_password }}" + password: "{{ designate_galera_password }}" host: "{{ item }}" state: "present" priv: "{{ designate_galera_database }}.*:ALL" @@ -73,7 +73,7 @@ login_password: "{{ galera_root_password }}" login_host: "{{ designate_galera_address }}" name: "{{ designate_pool_manager_galera_user }}" - password: "{{ designate_pool_manager_container_mysql_password }}" + password: "{{ designate_pool_manager_galera_password }}" host: "{{ item }}" state: "present" priv: "{{ designate_pool_manager_galera_database }}.*:ALL"