aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorRohit Pagedar <rohitpagedar@gmail.com>2015-10-14 16:13:07 -0400
committerRohit Pagedar <rohitpagedar@gmail.com>2015-12-04 13:48:14 -0500
commit444d3ba9028e8e4620db4cb90aa4805cbe7b4686 (patch)
tree882f9ec6f44965d2944eab42d417b73adb90a23d /puppet/hieradata
parent5a6907f2b829f34daa5f2d9d9cd69de35a1b9c56 (diff)
Making nova parameters configurable for nuage-metadata-agent
Exposing 'instance_name_template' to be set via extra config for nuage-metadata-agent to function Making nova::api::admin_tenant_name available on the compute node which is required by nuage-metadata-agent service Making KeystonePublicApiVirtualIP available on the compute node, which is used by the nuage-metadata-agent to build the auth-url Change-Id: I9736015e18cebf32b07940bf559063b60085f2fb
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/common.yaml1
-rw-r--r--puppet/hieradata/controller.yaml1
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 95f5ccb8..b4b51abf 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -7,6 +7,7 @@ ceilometer::agent::auth::auth_region: 'regionOne'
# changes in the tripleo-incubator keystone role setup
ceilometer::agent::auth::auth_tenant_name: 'admin'
+nova::api::admin_tenant_name: 'service'
nova::network::neutron::neutron_admin_tenant_name: 'service'
nova::network::neutron::neutron_admin_username: 'neutron'
nova::network::neutron::dhcp_domain: ''
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index f42ddf6c..b0e6ae96 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -30,7 +30,6 @@ redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
# service tenant
-nova::api::admin_tenant_name: 'service'
glance::api::keystone_tenant: 'service'
glance::registry::keystone_tenant: 'service'
neutron::server::auth_tenant: 'service'