summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-25 14:58:10 +0000
committerGerrit Code Review <review@openstack.org>2016-07-25 14:58:10 +0000
commitcb9fafe37c6c8134207a46707566d5c2d57109d9 (patch)
tree62803aa7c4041e65d5ef0ba2c8abaa78ad171bac
parent11a27c9a3b4e0969f3a89c2a9485f72317577c12 (diff)
parent056ce2374851e4e96dd3fd822de9da76b35e1eb7 (diff)
Merge "Explicitly set nova and neutron host on controllers"
-rw-r--r--puppet/hieradata/compute.yaml3
-rw-r--r--puppet/services/neutron-base.yaml1
-rw-r--r--puppet/services/nova-base.yaml3
3 files changed, 3 insertions, 4 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 62728332..fe203be7 100644
--- 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 7143cd99..301759c7 100644
--- 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 99ae520a..c94e0246 100644
--- 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}"'