openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove deprecated options designate"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 09:57:24 +00:00 committed by Gerrit Code Review
commit a5dfa415a9
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/designate/templates/designate.conf.j2
View File

@ -11,12 +11,8 @@ default_pool_id = {{ designate_pool_id }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
[service:api] [service:api]
listen = {{ hostvars[inventory_hostname]['ansible_' + dns_interface]['ipv4']['address'] }}:{{ designate_api_port }}
api_base_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ designate_api_port }} api_base_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ designate_api_port }}
api_host = {{ api_interface_address }}
api_port = {{ designate_api_port }}
enable_api_v1 = True
enabled_extensions_v1 = 'diagnostics, quotas, reports, sync, touch'
enable_api_v2 = True
enabled_extensions_v2 = 'quotas, reports' enabled_extensions_v2 = 'quotas, reports'
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
@ -30,6 +26,7 @@ project_name = service
username = {{ designate_keystone_user }} username = {{ designate_keystone_user }}
password = {{ designate_keystone_password }} password = {{ designate_keystone_password }}
http_connect_timeout = 60 http_connect_timeout = 60
service_token_roles_required = True
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
@ -44,6 +41,8 @@ listen = {{ hostvars[inventory_hostname]['ansible_' + dns_interface]['ipv4']['ad
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
[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 enabled = True
notify = True notify = True
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
@ -92,6 +91,8 @@ formatv6 = '%(hostname)s.%(project)s.%(zone)s'
topics = notifications_designate topics = notifications_designate
driver = messagingv2 driver = messagingv2
# TODO (egonzalez): Currently pool update fail when using transport_url.
# Remove this section after bug https://bugs.launchpad.net/designate/+bug/1673403 is fixed
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}

26
doc/designate-guide.rst
View File

@ -74,7 +74,7 @@ List available networks:
.. code-block:: console .. code-block:: console
$ neutron net-list $ openstack network list
Associate a domain to a network: Associate a domain to a network:
@ -97,18 +97,18 @@ Check DNS records in Designate:
.. code-block:: console .. code-block:: console
$ designate record-list sample.openstack.org. $ openstack recordset list sample.openstack.org.
+--------------------------------------+------+---------------------------------------+---------------------------------------------+ +--------------------------------------+---------------------------------------+------+---------------------------------------------+--------+--------+
| id | type | name | data | | id | name | type | records | status | action |
+--------------------------------------+------+---------------------------------------+---------------------------------------------+ +--------------------------------------+---------------------------------------+------+---------------------------------------------+--------+--------+
| 5aec6f5b-2121-4a2e-90d7-9e4509f79506 | SOA | sample.openstack.org. | sample.openstack.org. | | 5aec6f5b-2121-4a2e-90d7-9e4509f79506 | sample.openstack.org. | SOA | sample.openstack.org. | ACTIVE | NONE |
| | | | admin.sample.openstack.org. 1485266928 3514 | | | | | admin.sample.openstack.org. 1485266928 3514 | | |
| | | | 600 86400 3600 | | | | | 600 86400 3600 | | |
| 578dc94a-df74-4086-a352-a3b2db9233ae | NS | sample.openstack.org. | sample.openstack.org. | | 578dc94a-df74-4086-a352-a3b2db9233ae | sample.openstack.org. | NS | sample.openstack.org. | ACTIVE | NONE |
| de9ff01e-e9ef-4a0f-88ed-6ec5ecabd315 | A | 192-168-190-232.sample.openstack.org. | 192.168.190.232 | | de9ff01e-e9ef-4a0f-88ed-6ec5ecabd315 | 192-168-190-232.sample.openstack.org. | A | 192.168.190.232 | ACTIVE | NONE |
| f67645ee-829c-4154-a988-75341050a8d6 | A | my-vm.None.sample.openstack.org. | 192.168.190.232 | | f67645ee-829c-4154-a988-75341050a8d6 | my-vm.None.sample.openstack.org. | A | 192.168.190.232 | ACTIVE | NONE |
| e5623d73-4f9f-4b54-9045-b148e0c3342d | A | my-vm.sample.openstack.org. | 192.168.190.232 | | e5623d73-4f9f-4b54-9045-b148e0c3342d | my-vm.sample.openstack.org. | A | 192.168.190.232 | ACTIVE | NONE |
+--------------------------------------+------+---------------------------------------+---------------------------------------------+ +--------------------------------------+---------------------------------------+------+---------------------------------------------+--------+--------+
Query instance DNS information to Designate ``dns_interface`` IP address: Query instance DNS information to Designate ``dns_interface`` IP address: