x/packstack
Code Issues Proposed changes

Merge "Drop use of deprecated neutron auth options"

Browse Source
This commit is contained in:
Jenkins
2016-01-26 15:55:37 +00:00
committed by Gerrit Code Review
parent 78e8bf1688 525f442581
commit a605e772c1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/puppet/templates/nova_neutron.pp
View File

@@ -1,12 +1,12 @@
$nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::nova::network::neutron': class { '::nova::network::neutron':
neutron_admin_password => hiera('CONFIG_NEUTRON_KS_PW'), neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_strategy => 'keystone', neutron_auth_plugin => 'password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696", neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_admin_tenant_name => 'services', neutron_tenant_name => 'services',
neutron_admin_auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), neutron_auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'), neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
} }
class { '::nova::compute::neutron': class { '::nova::compute::neutron':