openstack/fuel-library
Code Issues Proposed changes

Merge "Adding ssl option for correct keystone enpoint creation"

Browse Source
This commit is contained in:
Jenkins 2015-07-23 22:19:41 +00:00 committed by Gerrit Code Review
commit 99a4eafcb0
5 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp
View File

@ -2,6 +2,11 @@ notice('MODULAR: ceilometer/keystone.pp')
$ceilometer_hash = hiera_hash('ceilometer', {})
$public_address = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_protocol = $public_ssl_hash['services'] ? {
true => 'https',
default => 'http',
}
$admin_address = hiera('management_vip')
$region = pick($ceilometer_hash['region'], 'RegionOne')
$password = $ceilometer_hash['user_password']
@ -23,6 +28,7 @@ class { '::ceilometer::keystone::auth':
configure_user_role => $configure_user_role,
service_name => $service_name,
public_address => $public_address,
public_protocol => $public_protocol,
admin_address => $admin_address,
internal_address => $admin_address,
region => $region,

6
deployment/puppet/osnailyfacter/modular/glance/keystone.pp
View File

@ -2,6 +2,11 @@ notice('MODULAR: glance/keystone.pp')
$glance_hash = hiera_hash('glance', {})
$public_address = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_protocol = $public_ssl_hash['services'] ? {
true => 'https',
default => 'http',
}
$admin_address = hiera('management_vip')
$region = pick($glance_hash['region'], 'RegionOne')
$password = $glance_hash['user_password']
@ -23,6 +28,7 @@ class { '::glance::keystone::auth':
configure_user_role => $configure_user_role,
service_name => $service_name,
public_address => $public_address,
public_protocol => $public_protocol,
admin_address => $admin_address,
internal_address => $admin_address,
region => $region,

14
deployment/puppet/osnailyfacter/modular/openstack-cinder/keystone.pp
View File

@ -1,9 +1,14 @@
notice('MODULAR: cinder/keystone.pp')
$cinder_hash = hiera_hash('cinder', {})
$public_address = hiera('public_vip')
$admin_address = hiera('management_vip')
$region = pick($cinder_hash['region'], 'RegionOne')
$cinder_hash = hiera_hash('cinder', {})
$public_address = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_protocol = $public_ssl_hash['services'] ? {
true => 'https',
default => 'http',
}
$admin_address = hiera('management_vip')
$region = pick($cinder_hash['region'], 'RegionOne')
$password = $cinder_hash['user_password']
$auth_name = pick($cinder_hash['auth_name'], 'cinder')
@ -24,6 +29,7 @@ class { '::cinder::keystone::auth':
configure_user_role => $configure_user_role,
service_name => $service_name,
public_address => $public_address,
public_protocol => $public_protocol,
admin_address => $admin_address,
internal_address => $admin_address,
region => $region,

14
deployment/puppet/osnailyfacter/modular/openstack-controller/keystone.pp
View File

@ -1,9 +1,14 @@
notice('MODULAR: openstack-controller/keystone.pp')
$nova_hash = hiera_hash('nova', {})
$public_address = hiera('public_vip')
$admin_address = hiera('management_vip')
$region = pick($nova_hash['region'], 'RegionOne')
$nova_hash = hiera_hash('nova', {})
$public_address = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_protocol = $public_ssl_hash['services'] ? {
true => 'https',
default => 'http',
}
$admin_address = hiera('management_vip')
$region = pick($nova_hash['region'], 'RegionOne')
$password = $nova_hash['user_password']
$auth_name = pick($nova_hash['auth_name'], 'nova')
@ -24,6 +29,7 @@ class { '::nova::keystone::auth':
configure_user_role => $configure_user_role,
service_name => $service_name,
public_address => $public_address,
public_protocol => $public_protocol,
admin_address => $admin_address,
internal_address => $admin_address,
region => $region,

14
deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp
View File

@ -1,9 +1,14 @@
notice('MODULAR: openstack-network/keystone.pp')
$neutron_hash = hiera_hash('quantum_settings', {})
$public_address = hiera('public_vip')
$admin_address = hiera('management_vip')
$region = pick($neutron_hash['region'], 'RegionOne')
$neutron_hash = hiera_hash('quantum_settings', {})
$public_address = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_protocol = $public_ssl_hash['services'] ? {
true => 'https',
default => 'http',
}
$admin_address = hiera('management_vip')
$region = pick($neutron_hash['region'], 'RegionOne')
$password = $neutron_hash['keystone']['admin_password']
$auth_name = pick($neutron_hash['auth_name'], 'neutron')
@ -24,6 +29,7 @@ class { '::neutron::keystone::auth':
configure_user_role => $configure_user_role,
service_name => $service_name,
public_address => $public_address,
public_protocol => $public_protocol,
admin_address => $admin_address,
internal_address => $admin_address,
region => $region,