Merge "Use neutron::keystone::authtoken for Neutron manifests" into stable/newton
This commit is contained in:
commit
af7b24ad29
|
@ -12,11 +12,16 @@ class packstack::neutron::api ()
|
||||||
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
||||||
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
|
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
|
||||||
|
|
||||||
|
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':
|
class { '::neutron::server':
|
||||||
database_connection => $neutron_sql_connection,
|
database_connection => $neutron_sql_connection,
|
||||||
password => $neutron_user_password,
|
|
||||||
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
|
||||||
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
|
||||||
sync_db => true,
|
sync_db => true,
|
||||||
enabled => true,
|
enabled => true,
|
||||||
api_workers => hiera('CONFIG_SERVICE_WORKERS'),
|
api_workers => hiera('CONFIG_SERVICE_WORKERS'),
|
||||||
|
|
|
@ -6,18 +6,20 @@ class packstack::provision::bridge ()
|
||||||
$provision_tempest_br = str2bool(hiera('CONFIG_PROVISION_TEMPEST'))
|
$provision_tempest_br = str2bool(hiera('CONFIG_PROVISION_TEMPEST'))
|
||||||
$provision_demo_br = str2bool(hiera('CONFIG_PROVISION_DEMO'))
|
$provision_demo_br = str2bool(hiera('CONFIG_PROVISION_DEMO'))
|
||||||
|
|
||||||
|
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
|
||||||
|
|
||||||
if $provision_demo_br {
|
if $provision_demo_br {
|
||||||
$floating_range_br = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
|
$floating_range_br = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
|
||||||
} elsif $provision_tempest_br {
|
} elsif $provision_tempest_br {
|
||||||
$floating_range_br = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
|
$floating_range_br = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
|
||||||
}
|
}
|
||||||
|
|
||||||
neutron_config {
|
class { '::neutron::keystone::authtoken':
|
||||||
'keystone_authtoken/identity_uri': value => hiera('CONFIG_KEYSTONE_ADMIN_URL');
|
username => 'neutron',
|
||||||
'keystone_authtoken/auth_uri': value => hiera('CONFIG_KEYSTONE_PUBLIC_URL');
|
password => $neutron_user_password,
|
||||||
'keystone_authtoken/admin_tenant_name': value => 'services';
|
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
||||||
'keystone_authtoken/admin_user': value => 'neutron';
|
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
||||||
'keystone_authtoken/admin_password': value => hiera('CONFIG_NEUTRON_KS_PW');
|
project_name => 'services',
|
||||||
}
|
}
|
||||||
|
|
||||||
if $provision_neutron_br and $setup_ovs_bridge {
|
if $provision_neutron_br and $setup_ovs_bridge {
|
||||||
|
|
Loading…
Reference in New Issue