Merge "Explicitly set nova and neutron host on controllers"

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 6272833..fe203be 100644 (file)
--- 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 7143cd9..301759c 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -61,3 +61,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 99ae520..c94e024 100644 (file)
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -38,7 +38,7 @@ parameters:
 
 outputs:
   role_data:
-    description: Role data for the Neutron base service.
+    description: Role data for the Nova base service.
     value:
       service_name: nova-base
       config_settings:
@@ -79,3 +79,4 @@ outputs:
           - '%'
           - "%{hiera('mysql_bind_host')}"
         nova::debug: {get_param: Debug}
+        nova::host: '"%{::fqdn}"'