summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2016-04-12 15:44:49 -0500
committerBen Nemec <bnemec@redhat.com>2016-07-21 14:06:51 -0500
commit056ce2374851e4e96dd3fd822de9da76b35e1eb7 (patch)
treea8050987a392c7f36d66bc7d3d87e265fb7799e5
parent35aceb0876b51fe990e369f900fd2dd3d45e6dfa (diff)
Explicitly set nova and neutron host on controllers
In I7d07c57b7276815c72d08acaa86f673e43eb0498 we set this for compute nodes, but we also need it for controllers. Otherwise when a controller reboots it may come back up with a different host value, which seems to break networking for anything that was created before the reboot. In my case, it changes from the short hostname (without domain name) to the fqdn. Since we set it to fqdn for the compute nodes, let's do the same for controllers. This moves all of the host setting to the base yaml of the nova and neutron profiles. Change-Id: Ieb793b9e9fd2dfc98584691412f9991aa99e0b47 Closes-Bug: 1604907
-rw-r--r--puppet/hieradata/compute.yaml3
-rw-r--r--puppet/services/neutron-base.yaml1
-rw-r--r--puppet/services/nova-base.yaml3
3 files changed, 3 insertions, 4 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 62728332..fe203be7 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -1,6 +1,5 @@
# Hiera data here applies to all compute nodes
-nova::host: "%{::fqdn}"
nova::notify_on_state_change: 'vm_and_task_state'
nova::notification_driver: messagingv2
nova::compute::instance_usage_audit: true
@@ -19,6 +18,4 @@ nova::compute::reserved_host_memory: 2048
ceilometer::agent::auth::auth_tenant_name: 'service'
ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
-neutron::host: "%{::fqdn}"
-
compute_classes: []
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 8bd8d989..73f707cc 100644
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -60,3 +60,4 @@ outputs:
params:
PLUGINS: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug}
+ neutron::host: '"%{::fqdn}"'
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 7de14f68..c67a1d8a 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -29,7 +29,7 @@ parameters:
outputs:
role_data:
- description: Role data for the Neutron base service.
+ description: Role data for the Nova base service.
value:
config_settings:
nova::rabbit_password: {get_param: RabbitPassword}
@@ -37,3 +37,4 @@ outputs:
nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
nova::rabbit_port: {get_param: RabbitClientPort}
nova::debug: {get_param: Debug}
+ nova::host: '"%{::fqdn}"'