summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-03-05 08:33:54 -0500
committerJames Slagle <jslagle@redhat.com>2016-03-07 14:32:10 -0500
commit1fc883bd06a705858065fb590f36126964858ddf (patch)
tree45bd5b59206581892046c93446787e1f82ea58a3 /puppet
parent00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (diff)
Set host in nova.conf for compute nodes
In order for instance HA to function safely, nova-compute needs access to the name by which nova knows the current compute node. Since the names of the nova-compute and neutron ml2 agents must be the same for vif binding to work, it also sets the host value in neutron.conf. Change-Id: I7d07c57b7276815c72d08acaa86f673e43eb0498
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_compute.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 7925f50a..dcf63740 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -56,6 +56,7 @@ include ::nova::compute
nova_config {
'DEFAULT/my_ip': value => $ipaddress;
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
+ 'DEFAULT/host': value => $fqdn;
}
$rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
@@ -146,6 +147,9 @@ else {
}
}
+neutron_config {
+ 'DEFAULT/host': value => $fqdn;
+}
include ::ceilometer
include ::ceilometer::config