aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-02 07:12:50 +0000
committerGerrit Code Review <review@openstack.org>2016-06-02 07:12:51 +0000
commit7872505beb3a0961258d1fbdb8e08a5840ec0a8c (patch)
treef933bcf685be76c2352383e23ac92a925167718f
parentbcbb89a92141ecf650c0b5b4bad128f47659971d (diff)
parentfcbb6f541ddd104dc765b4c23d444e51df21bc29 (diff)
Merge "Take 'host' parameter from nova manifest into use"
-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' {