summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 15:42:41 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 15:42:41 +0000
commit4de8226a6ddbabed909c74993851c441a44fbd94 (patch)
treef9d43cd8995ff71f71501e150b5fb1a49cc0f9ee
parentba875e3edd4ffaa0b19e3af1646d69a0e39b2f50 (diff)
parent437b116e461396da1a7e94f1c6afde36cb380dae (diff)
Merge "Default neutron's dns_domain to undercloud's domain"
-rw-r--r--elements/puppet-stack-config/puppet-stack-config.pp6
-rw-r--r--elements/puppet-stack-config/puppet-stack-config.yaml.template4
-rw-r--r--instack_undercloud/undercloud.py6
-rw-r--r--releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml7
4 files changed, 18 insertions, 5 deletions
diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index cb42409..9770ef0 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -380,9 +380,11 @@ include ::nova::scheduler
380include ::nova::scheduler::filter 380include ::nova::scheduler::filter
381include ::nova::compute 381include ::nova::compute
382 382
383$neutron_dns_domain = pick(hiera('overcloud_domain_name', $::domain), $::os_service_default)
383class { '::neutron': 384class { '::neutron':
384 rabbit_hosts => [hiera('controller_host')], 385 rabbit_hosts => [hiera('controller_host')],
385 debug => hiera('debug'), 386 debug => hiera('debug'),
387 dns_domain => $neutron_dns_domain
386} 388}
387 389
388include ::neutron::server 390include ::neutron::server
@@ -491,7 +493,9 @@ nova_config {
491} 493}
492 494
493include ::nova::compute::ironic 495include ::nova::compute::ironic
494include ::nova::network::neutron 496class { '::nova::network::neutron':
497 dhcp_domain => $neutron_dns_domain
498}
495 499
496# Ironic 500# Ironic
497 501
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 6c727cd..806cfa8 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -11,6 +11,8 @@ ntp::servers: {{UNDERCLOUD_NTP_SERVERS}}
11 11
12sysctl_settings: {{SYSCTL_SETTINGS}} 12sysctl_settings: {{SYSCTL_SETTINGS}}
13 13
14overcloud_domain_name: {{OVERCLOUD_DOMAIN_NAME}}
15
14# SSL 16# SSL
15tripleo::haproxy::service_certificate: {{UNDERCLOUD_SERVICE_CERTIFICATE}} 17tripleo::haproxy::service_certificate: {{UNDERCLOUD_SERVICE_CERTIFICATE}}
16generate_service_certificates: {{GENERATE_SERVICE_CERTIFICATE}} 18generate_service_certificates: {{GENERATE_SERVICE_CERTIFICATE}}
@@ -237,7 +239,6 @@ neutron::debug: "%{hiera('debug')}"
237neutron::bind_host: {{LOCAL_IP}} 239neutron::bind_host: {{LOCAL_IP}}
238neutron::core_plugin: ml2 240neutron::core_plugin: ml2
239neutron::dhcp_agents_per_network: 2 241neutron::dhcp_agents_per_network: 2
240neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
241neutron::server::api_workers: "%{::os_workers}" 242neutron::server::api_workers: "%{::os_workers}"
242neutron::server::rpc_workers: "%{::os_workers}" 243neutron::server::rpc_workers: "%{::os_workers}"
243neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}} 244neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
@@ -405,7 +406,6 @@ nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWO
405nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement 406nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
406nova::notify_on_state_change: 'vm_and_task_state' 407nova::notify_on_state_change: 'vm_and_task_state'
407nova::scheduler::enabled: true 408nova::scheduler::enabled: true
408nova::network::neutron::dhcp_domain: {{OVERCLOUD_DOMAIN_NAME}}
409nova::compute::force_config_drive: true 409nova::compute::force_config_drive: true
410nova::compute::reserved_host_memory: '0' 410nova::compute::reserved_host_memory: '0'
411nova::compute::vnc_enabled: false 411nova::compute::vnc_enabled: false
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 6ae0859..e22fa76 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -152,10 +152,12 @@ _opts = [
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', 154 cfg.StrOpt('overcloud_domain_name',
155 default='localdomain', 155 default='',
156 help=('DNS domain name to use when deploying the overcloud. ' 156 help=('DNS domain name to use when deploying the overcloud. '
157 'The overcloud parameter "CloudDomain" must be set to a ' 157 'The overcloud parameter "CloudDomain" must be set to a '
158 'matching value.') 158 'matching value. When unset, the installation will try '
159 'to use the undercloud\'s domain name, and if that fails '
160 'it\'ll use the default from neutron.conf.')
159 ), 161 ),
160 cfg.StrOpt('undercloud_service_certificate', 162 cfg.StrOpt('undercloud_service_certificate',
161 default='', 163 default='',
diff --git a/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml b/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml
new file mode 100644
index 0000000..40843dc
--- /dev/null
+++ b/releasenotes/notes/Make-dns_domain-configurable-1411b51b65b83ded.yaml
@@ -0,0 +1,7 @@
1---
2features:
3 - the dns_domain parameter in neutron.conf is now configurable through the
4 overcloud_domain_name configuration parameter in undercloud.conf. In the
5 absence of this parameter, the installation will try to use the domain
6 from the undercloud, and if this fails, it will then just use the default
7 from neutron.conf.