x/packstack
Code Issues Proposed changes

Adapt to new parameters in puppet-nova

Browse Source 
https://review.openstack.org/276932 changed some puppet-nova
parameters to adapt to changes in the Nova-Neutron configuration.
We need to fix Packstack as well.

Change-Id: Ie5ae2ff5b6d5d8a4ee5cdeeb272a64cbd5165eff
This commit is contained in:
Javier Pena
2016-02-09 14:17:25 +01:00
parent 27caa22d94
commit ed92826b8c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,12 @@
$nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$neutron_auth_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
class { '::nova::network::neutron': class { '::nova::network::neutron':
neutron_password => hiera('CONFIG_NEUTRON_KS_PW'), neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_plugin => 'password', neutron_auth_plugin => 'v3password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696", neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_tenant_name => 'services', neutron_project_name => 'services',
neutron_auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), neutron_auth_url => "${neutron_auth_url}/v3",
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'), neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
} }