diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-07 20:39:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-07 20:39:12 +0000 |
| commit | 10b6bb97133eb36ef0185fd903b3f112cd70a5db (patch) | |
| tree | 28b9cb1954b04e0976ddcae56ffda08a76a5b021 /puppet/hieradata | |
| parent | 4e293c2ada6696f17fa78b6c0aebb815fee5a32d (diff) | |
| parent | 444d3ba9028e8e4620db4cb90aa4805cbe7b4686 (diff) | |
Merge "Making nova parameters configurable for nuage-metadata-agent"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 |
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' |