x/packstack
Code Issues Proposed changes

Use neutron::keystone::authtoken for Neutron manifests

Browse Source 
Neutron has moved to neutron::keystone::authtoken, so we need to
adapt Packstack. This also fixes a case where, if the network node
is not the controller node, Packstack fails.

Change-Id: I69850b92338158189a783af2cbe7f90c569607b1
Closes-Bug: #1633491
This commit is contained in:
Javier Pena
2016-10-14 16:15:16 +02:00
parent e7c0e05b10
commit 95f95e4999
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/puppet/modules/packstack/manifests/neutron/api.pp
View File

@@ -12,11 +12,16 @@ class packstack::neutron::api ()
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
class { '::neutron::server':
database_connection => $neutron_sql_connection,
class { '::neutron::keystone::authtoken':
username => 'neutron',
password => $neutron_user_password,
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
project_name => 'services',
}
class { '::neutron::server':
database_connection => $neutron_sql_connection,
sync_db => true,
enabled => true,
api_workers => hiera('CONFIG_SERVICE_WORKERS'),

14
packstack/puppet/modules/packstack/manifests/provision/bridge.pp
View File

@@ -6,18 +6,20 @@ class packstack::provision::bridge ()
$provision_tempest_br = str2bool(hiera('CONFIG_PROVISION_TEMPEST'))
$provision_demo_br = str2bool(hiera('CONFIG_PROVISION_DEMO'))
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
if $provision_demo_br {
$floating_range_br = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
} elsif $provision_tempest_br {
$floating_range_br = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
}
neutron_config {
'keystone_authtoken/identity_uri': value => hiera('CONFIG_KEYSTONE_ADMIN_URL');
'keystone_authtoken/auth_uri': value => hiera('CONFIG_KEYSTONE_PUBLIC_URL');
'keystone_authtoken/admin_tenant_name': value => 'services';
'keystone_authtoken/admin_user': value => 'neutron';
'keystone_authtoken/admin_password': value => hiera('CONFIG_NEUTRON_KS_PW');
class { '::neutron::keystone::authtoken':
username => 'neutron',
password => $neutron_user_password,
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
project_name => 'services',
}
if $provision_neutron_br and $setup_ovs_bridge {