diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index ee12db66e6..057f7ef758 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/ansible/roles/designate/defaults/main.yml @@ -73,10 +73,6 @@ designate_database_name: "designate" designate_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}designate{% endif %}" designate_database_address: "{{ database_address }}:{{ database_port }}" -designate_pool_manager_database_name: "designate_pool_manager" -designate_pool_manager_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}designate_pool_manager{% endif %}" -designate_pool_manager_database_address: "{{ database_address }}:{{ database_port }}" - #################### # Docker diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index eff4c58262..0317c1fd3f 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/ansible/roles/designate/tasks/bootstrap.yml @@ -13,7 +13,6 @@ delegate_to: "{{ groups['designate-central'][0] }}" with_items: - "{{ designate_database_name }}" - - "{{ designate_pool_manager_database_name }}" when: - not use_preconfigured_databases | bool @@ -37,9 +36,6 @@ - database_name: "{{ designate_database_name }}" database_user: "{{ designate_database_user }}" database_password: "{{ designate_database_password }}" - - database_name: "{{ designate_pool_manager_database_name }}" - database_user: "{{ designate_pool_manager_database_user }}" - database_password: "{{ designate_pool_manager_database_password }}" when: - not use_preconfigured_databases | bool no_log: true diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index 749ccdf0c1..e8e2210a4d 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -44,10 +44,6 @@ workers = {{ openstack_service_workers }} {% endif %} [service:worker] -# TODO (egonzalez): Remove enabled option in worker section once https://bugs.launchpad.net/designate/+bug/1676827 -# is fixed. Enabled is deprecated but without explicitly enabling worker service not start -enabled = True -notify = True workers = {{ openstack_service_workers }} [service:producer] @@ -56,22 +52,9 @@ threads = 1000 enabled_tasks = None export_synchronous = True -[service:pool_manager] -cache_driver = sqlalchemy -pool_id = {{ designate_pool_id }} -workers = {{ openstack_service_workers }} - [network_api:neutron] endpoint_type = internalURL -[pool_manager_cache:sqlalchemy] -connection = mysql+pymysql://{{ designate_pool_manager_database_user }}:{{ designate_pool_manager_database_password }}@{{ designate_pool_manager_database_address }}/{{ designate_pool_manager_database_name }} -max_retries = 10 -idle_timeout = 3600 - -[pool_manager_cache:memcache] -memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} - [storage:sqlalchemy] connection = mysql+pymysql://{{ designate_database_user }}:{{ designate_database_password }}@{{ designate_database_address }}/{{ designate_database_name }} max_retries = 10