summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/common.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-24 10:04:18 +0000
committerGerrit Code Review <review@openstack.org>2016-02-24 10:04:18 +0000
commit9badd7485b7bcf817c0eeb4a207dd5b6cc2d7dd2 (patch)
tree58583cc2706215f599fb019a11f1460d9eca8a6e /puppet/hieradata/common.yaml
parent949b6d1cc247a66869c627a504436f1642481667 (diff)
parent8c6943e898453b3e6fb05c1d238301bdb7d0fef5 (diff)
Merge "Update nova::network::neutron variables to drop deprecated parameters"
Diffstat (limited to 'puppet/hieradata/common.yaml')
-rw-r--r--puppet/hieradata/common.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 30645687..03366c7e 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -8,8 +8,8 @@ ceilometer::agent::auth::auth_region: 'regionOne'
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::neutron_project_name: 'service'
+nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::dhcp_domain: ''
neutron::allow_overlapping_ips: true