summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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--requirements.txt2
-rw-r--r--undercloud.conf.sample5
5 files changed, 20 insertions, 3 deletions
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 48c0486..267babc 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -237,7 +237,7 @@ neutron::debug: "%{hiera('debug')}"
237neutron::bind_host: {{LOCAL_IP}} 237neutron::bind_host: {{LOCAL_IP}}
238neutron::core_plugin: ml2 238neutron::core_plugin: ml2
239neutron::dhcp_agents_per_network: 2 239neutron::dhcp_agents_per_network: 2
240neutron::dns_domain: '' 240neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
241neutron::server::api_workers: "%{::os_workers}" 241neutron::server::api_workers: "%{::os_workers}"
242neutron::server::rpc_workers: "%{::os_workers}" 242neutron::server::rpc_workers: "%{::os_workers}"
243neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}} 243neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
@@ -405,7 +405,7 @@ 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 405nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
406nova::notify_on_state_change: 'vm_and_task_state' 406nova::notify_on_state_change: 'vm_and_task_state'
407nova::scheduler::enabled: true 407nova::scheduler::enabled: true
408nova::network::neutron::dhcp_domain: '' 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 1c893a4..92e5144 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/requirements.txt b/requirements.txt
index 64ee796..edff4a5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4six>=1.9.0 # MIT 4six>=1.9.0 # MIT
5python-keystoneclient>=3.8.0 # Apache-2.0 5python-keystoneclient>=3.8.0 # Apache-2.0
6python-novaclient>=7.1.0 # Apache-2.0 6python-novaclient>=9.0.0 # Apache-2.0
7python-mistralclient>=3.1.0 # Apache-2.0 7python-mistralclient>=3.1.0 # Apache-2.0
8python-swiftclient>=3.2.0 # Apache-2.0 8python-swiftclient>=3.2.0 # Apache-2.0
9oslo.config>=4.0.0 # Apache-2.0 9oslo.config>=4.0.0 # Apache-2.0
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)