summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2017-06-01 20:38:09 +0000
committerBen Nemec <bnemec@redhat.com>2017-06-14 22:02:19 +0000
commit675a59e8cec2527b9e1e78654a616b2672328021 (patch)
tree5d1b768ecbe9f9014a1dca0e974268a0ec9340b1
parent5903151ff5f42ee9e3a3e0a58d17df4a86fb2da8 (diff)
Allow setting the DNS domain name in undercloud.conf
Without being able to do this, users who want to set CloudDomain during their deployment will have to manually override neutron's dns_domain config, which either requires custom hieradata or the reapplication of the customization after each undercloud update. This is not a good user experience, so we should allow them to set it once in the config file and never have to touch it again. It turns out that the Nova dhcp_domain option must also be set, even though it is a deprecated option. A bug with nova has been opened to address this in the future. Change-Id: I61e5fc005aa27ba76f91a2b84fec751af93061b5 Related-Bug: 1698010
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+1: Harald Jensås <hjensas@redhat.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 15 Jun 2017 16:09:28 +0000 Reviewed-on: https://review.openstack.org/470007 Project: openstack/instack-undercloud Branch: refs/heads/master
-rw-r--r--elements/puppet-stack-config/puppet-stack-config.yaml.template4
-rw-r--r--instack_undercloud/undercloud.py6
-rw-r--r--releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml6
-rw-r--r--undercloud.conf.sample5
4 files changed, 19 insertions, 2 deletions
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 91c90ec..4d0324d 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -241,7 +241,7 @@ neutron::debug: "%{hiera('debug')}"
241neutron::bind_host: {{LOCAL_IP}} 241neutron::bind_host: {{LOCAL_IP}}
242neutron::core_plugin: ml2 242neutron::core_plugin: ml2
243neutron::dhcp_agents_per_network: 2 243neutron::dhcp_agents_per_network: 2
244neutron::dns_domain: '' 244neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
245neutron::server::api_workers: "%{::os_workers}" 245neutron::server::api_workers: "%{::os_workers}"
246neutron::server::rpc_workers: "%{::os_workers}" 246neutron::server::rpc_workers: "%{::os_workers}"
247neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}} 247neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
@@ -408,7 +408,7 @@ nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWO
408nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement 408nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
409nova::notify_on_state_change: 'vm_and_task_state' 409nova::notify_on_state_change: 'vm_and_task_state'
410nova::scheduler::enabled: true 410nova::scheduler::enabled: true
411nova::network::neutron::dhcp_domain: '' 411nova::network::neutron::dhcp_domain: {{OVERCLOUD_DOMAIN_NAME}}
412nova::compute::force_config_drive: true 412nova::compute::force_config_drive: true
413nova::compute::reserved_host_memory: '0' 413nova::compute::reserved_host_memory: '0'
414nova::compute::vnc_enabled: false 414nova::compute::vnc_enabled: false
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index ffc16b6..4a99f1b 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -151,6 +151,12 @@ _opts = [
151 cfg.ListOpt('undercloud_ntp_servers', 151 cfg.ListOpt('undercloud_ntp_servers',
152 default=[], 152 default=[],
153 help=('List of ntp servers to use.')), 153 help=('List of ntp servers to use.')),
154 cfg.StrOpt('overcloud_domain_name',
155 default='localdomain',
156 help=('DNS domain name to use when deploying the overcloud. '
157 'The overcloud parameter "CloudDomain" must be set to a '
158 'matching value.')
159 ),
154 cfg.StrOpt('undercloud_service_certificate', 160 cfg.StrOpt('undercloud_service_certificate',
155 default='', 161 default='',
156 help=('Certificate file to use for OpenStack service SSL ' 162 help=('Certificate file to use for OpenStack service SSL '
diff --git a/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml b/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml
new file mode 100644
index 0000000..ae69104
--- /dev/null
+++ b/releasenotes/notes/set-dns-domain-08abe0d0fe7d2e65.yaml
@@ -0,0 +1,6 @@
1---
2features:
3 - |
4 The DNS domain for overcloud nodes can now be set in undercloud.conf
5 via the overcloud_domain_name option. The same value used for this option
6 must be passed to the overcloud deploy in the CloudDomain parameter.
diff --git a/undercloud.conf.sample b/undercloud.conf.sample
index 036ab2a..824084b 100644
--- a/undercloud.conf.sample
+++ b/undercloud.conf.sample
@@ -39,6 +39,11 @@
39# List of ntp servers to use. (list value) 39# List of ntp servers to use. (list value)
40#undercloud_ntp_servers = 40#undercloud_ntp_servers =
41 41
42# DNS domain name to use when deploying the overcloud. The overcloud
43# parameter "CloudDomain" must be set to a matching value. (string
44# value)
45#overcloud_domain_name = localdomain
46
42# Certificate file to use for OpenStack service SSL connections. 47# Certificate file to use for OpenStack service SSL connections.
43# Setting this enables SSL for the OpenStack API endpoints, leaving it 48# Setting this enables SSL for the OpenStack API endpoints, leaving it
44# unset disables SSL. (string value) 49# unset disables SSL. (string value)