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

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 1e888f3..40d4d47 100644 (file)
--- 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 cf20c0c..f766c36 100644 (file)
--- 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' {