summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-31 14:15:54 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-06-01 11:41:14 +0300
commitfcbb6f541ddd104dc765b4c23d444e51df21bc29 (patch)
treeefb728aae472b5ea489b6168327fbe6c701691e6 /puppet
parentccb46a51ac8ca59865c04b681628edbc5a167530 (diff)
Take 'host' parameter from nova manifest into use
Recently the 'host' parameter was added to the nova manifest. So we no longer need to manually add it to the configuration. Change-Id: I6f3dc50ea8737e5e7cd859685a9308edff976f31 Depends-On: Icce3ebc401442651942f8de3eabffadaad812377
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/compute.yaml1
-rw-r--r--puppet/manifests/overcloud_compute.pp1
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 1e888f39..40d4d47f 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -1,5 +1,6 @@
# 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::enabled: true
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cf20c0ca..f766c36e 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -108,7 +108,6 @@ if hiera('step') >= 4 {
nova_config {
'DEFAULT/my_ip': value => $ipaddress;
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
- 'DEFAULT/host': value => $fqdn;
}
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {