Merge "Revert "Default neutron's dns_domain to undercloud's domain""
This commit is contained in:
commit
88c3b8529b
|
@ -380,11 +380,9 @@ include ::nova::scheduler
|
||||||
include ::nova::scheduler::filter
|
include ::nova::scheduler::filter
|
||||||
include ::nova::compute
|
include ::nova::compute
|
||||||
|
|
||||||
$neutron_dns_domain = pick(hiera('overcloud_domain_name', $::domain), $::os_service_default)
|
|
||||||
class { '::neutron':
|
class { '::neutron':
|
||||||
rabbit_hosts => [hiera('controller_host')],
|
rabbit_hosts => [hiera('controller_host')],
|
||||||
debug => hiera('debug'),
|
debug => hiera('debug'),
|
||||||
dns_domain => $neutron_dns_domain
|
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::neutron::server
|
include ::neutron::server
|
||||||
|
@ -493,9 +491,7 @@ nova_config {
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::nova::compute::ironic
|
include ::nova::compute::ironic
|
||||||
class { '::nova::network::neutron':
|
include ::nova::network::neutron
|
||||||
dhcp_domain => $neutron_dns_domain
|
|
||||||
}
|
|
||||||
|
|
||||||
# Ironic
|
# Ironic
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,6 @@ ntp::servers: {{UNDERCLOUD_NTP_SERVERS}}
|
||||||
|
|
||||||
sysctl_settings: {{SYSCTL_SETTINGS}}
|
sysctl_settings: {{SYSCTL_SETTINGS}}
|
||||||
|
|
||||||
overcloud_domain_name: {{OVERCLOUD_DOMAIN_NAME}}
|
|
||||||
|
|
||||||
# SSL
|
# SSL
|
||||||
tripleo::haproxy::service_certificate: {{UNDERCLOUD_SERVICE_CERTIFICATE}}
|
tripleo::haproxy::service_certificate: {{UNDERCLOUD_SERVICE_CERTIFICATE}}
|
||||||
generate_service_certificates: {{GENERATE_SERVICE_CERTIFICATE}}
|
generate_service_certificates: {{GENERATE_SERVICE_CERTIFICATE}}
|
||||||
|
@ -239,6 +237,7 @@ neutron::debug: "%{hiera('debug')}"
|
||||||
neutron::bind_host: {{LOCAL_IP}}
|
neutron::bind_host: {{LOCAL_IP}}
|
||||||
neutron::core_plugin: ml2
|
neutron::core_plugin: ml2
|
||||||
neutron::dhcp_agents_per_network: 2
|
neutron::dhcp_agents_per_network: 2
|
||||||
|
neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
|
||||||
neutron::server::api_workers: "%{::os_workers}"
|
neutron::server::api_workers: "%{::os_workers}"
|
||||||
neutron::server::rpc_workers: "%{::os_workers}"
|
neutron::server::rpc_workers: "%{::os_workers}"
|
||||||
neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
|
neutron::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
|
||||||
|
@ -406,6 +405,7 @@ nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWO
|
||||||
nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
|
nova::placement_database_connection: mysql+pymysql://nova_placement:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_placement
|
||||||
nova::notify_on_state_change: 'vm_and_task_state'
|
nova::notify_on_state_change: 'vm_and_task_state'
|
||||||
nova::scheduler::enabled: true
|
nova::scheduler::enabled: true
|
||||||
|
nova::network::neutron::dhcp_domain: {{OVERCLOUD_DOMAIN_NAME}}
|
||||||
nova::compute::force_config_drive: true
|
nova::compute::force_config_drive: true
|
||||||
nova::compute::reserved_host_memory: '0'
|
nova::compute::reserved_host_memory: '0'
|
||||||
nova::compute::vnc_enabled: false
|
nova::compute::vnc_enabled: false
|
||||||
|
|
|
@ -156,12 +156,10 @@ _opts = [
|
||||||
default=[],
|
default=[],
|
||||||
help=('List of ntp servers to use.')),
|
help=('List of ntp servers to use.')),
|
||||||
cfg.StrOpt('overcloud_domain_name',
|
cfg.StrOpt('overcloud_domain_name',
|
||||||
default='',
|
default='localdomain',
|
||||||
help=('DNS domain name to use when deploying the overcloud. '
|
help=('DNS domain name to use when deploying the overcloud. '
|
||||||
'The overcloud parameter "CloudDomain" must be set to a '
|
'The overcloud parameter "CloudDomain" must be set to a '
|
||||||
'matching value. When unset, the installation will try '
|
'matching value.')
|
||||||
'to use the undercloud\'s domain name, and if that fails '
|
|
||||||
'it\'ll use the default from neutron.conf.')
|
|
||||||
),
|
),
|
||||||
cfg.StrOpt('undercloud_service_certificate',
|
cfg.StrOpt('undercloud_service_certificate',
|
||||||
default='',
|
default='',
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
---
|
|
||||||
features:
|
|
||||||
- the dns_domain parameter in neutron.conf is now configurable through the
|
|
||||||
overcloud_domain_name configuration parameter in undercloud.conf. In the
|
|
||||||
absence of this parameter, the installation will try to use the domain
|
|
||||||
from the undercloud, and if this fails, it will then just use the default
|
|
||||||
from neutron.conf.
|
|
Loading…
Reference in New Issue