[designate] Removed deprecated pool manager settings
The pool manager has long been deperecated and kolla-ansible does not currently have an option to enable it. So we can safely remove the settings around it. Change-Id: I8e97d72421caebba979df0135fb65879e6ae3903
This commit is contained in:
parent
d659c4dd15
commit
e07a67bddf
@ -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_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_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
|
# Docker
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
delegate_to: "{{ groups['designate-central'][0] }}"
|
delegate_to: "{{ groups['designate-central'][0] }}"
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ designate_database_name }}"
|
- "{{ designate_database_name }}"
|
||||||
- "{{ designate_pool_manager_database_name }}"
|
|
||||||
when:
|
when:
|
||||||
- not use_preconfigured_databases | bool
|
- not use_preconfigured_databases | bool
|
||||||
|
|
||||||
@ -37,9 +36,6 @@
|
|||||||
- database_name: "{{ designate_database_name }}"
|
- database_name: "{{ designate_database_name }}"
|
||||||
database_user: "{{ designate_database_user }}"
|
database_user: "{{ designate_database_user }}"
|
||||||
database_password: "{{ designate_database_password }}"
|
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:
|
when:
|
||||||
- not use_preconfigured_databases | bool
|
- not use_preconfigured_databases | bool
|
||||||
no_log: true
|
no_log: true
|
||||||
|
@ -44,10 +44,6 @@ workers = {{ openstack_service_workers }}
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
[service:worker]
|
[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 }}
|
workers = {{ openstack_service_workers }}
|
||||||
|
|
||||||
[service:producer]
|
[service:producer]
|
||||||
@ -56,22 +52,9 @@ threads = 1000
|
|||||||
enabled_tasks = None
|
enabled_tasks = None
|
||||||
export_synchronous = True
|
export_synchronous = True
|
||||||
|
|
||||||
[service:pool_manager]
|
|
||||||
cache_driver = sqlalchemy
|
|
||||||
pool_id = {{ designate_pool_id }}
|
|
||||||
workers = {{ openstack_service_workers }}
|
|
||||||
|
|
||||||
[network_api:neutron]
|
[network_api:neutron]
|
||||||
endpoint_type = internalURL
|
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]
|
[storage:sqlalchemy]
|
||||||
connection = mysql+pymysql://{{ designate_database_user }}:{{ designate_database_password }}@{{ designate_database_address }}/{{ designate_database_name }}
|
connection = mysql+pymysql://{{ designate_database_user }}:{{ designate_database_password }}@{{ designate_database_address }}/{{ designate_database_name }}
|
||||||
max_retries = 10
|
max_retries = 10
|
||||||
|
Loading…
Reference in New Issue
Block a user