From 5b9b349d98b769b3cdb7fe8362d27c61e58fc8ad Mon Sep 17 00:00:00 2001 From: Stanislaw Bogatkin Date: Thu, 23 Jul 2015 13:33:04 -0500 Subject: [PATCH] Adding ssl option for correct keystone enpoint creation Some code was broken due to inaccurate rebase, so it fixed by this commit. Change-Id: Icd4cbacfe554115c43fa2a8d16d74c1ef2ad7705 Closes-Bug: #1477715 --- .../osnailyfacter/modular/ceilometer/keystone.pp | 6 ++++++ .../osnailyfacter/modular/glance/keystone.pp | 6 ++++++ .../modular/openstack-cinder/keystone.pp | 14 ++++++++++---- .../modular/openstack-controller/keystone.pp | 14 ++++++++++---- .../modular/openstack-network/keystone.pp | 14 ++++++++++---- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp b/deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp index c51fe7329b..326db1d99b 100644 --- a/deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp @@ -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, diff --git a/deployment/puppet/osnailyfacter/modular/glance/keystone.pp b/deployment/puppet/osnailyfacter/modular/glance/keystone.pp index d1f4fe80a9..921713dc2d 100644 --- a/deployment/puppet/osnailyfacter/modular/glance/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/glance/keystone.pp @@ -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, diff --git a/deployment/puppet/osnailyfacter/modular/openstack-cinder/keystone.pp b/deployment/puppet/osnailyfacter/modular/openstack-cinder/keystone.pp index 6ead024b12..07b7720381 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-cinder/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-cinder/keystone.pp @@ -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, diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/keystone.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/keystone.pp index 67546697ed..c7663f464b 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-controller/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/keystone.pp @@ -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, diff --git a/deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp b/deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp index 9bad8e8c2e..f091e9b8d0 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp @@ -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,