openstack/openstack-ansible-os_designate
Code Issues Proposed changes

Merge "Updating designate role to align with integrated repo."

Browse Source
This commit is contained in:
Jenkins 2016-11-16 15:27:11 +00:00 committed by Gerrit Code Review
commit 55e1d28182
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/index.rst
View File

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

4
examples/playbook.yml
View File

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

4
extras/user_secrets_designate.yml
View File

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

4
templates/designate.conf.j2
View File

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

4
tests/os_designate-overrides.yml
View File

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

4
tests/test-install-designate.yml
View File

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