From df35ec624e74292393231f581a5e6413a1e5e998 Mon Sep 17 00:00:00 2001 From: Igor Gajsin Date: Tue, 30 Aug 2016 17:05:31 +0300 Subject: [PATCH] add the tls support Change-Id: I15e89f295ec0b4ea2fd408d58a089263b4ca8ff8 --- .../puppet/manifests/keystone.pp | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/deployment_scripts/puppet/manifests/keystone.pp b/deployment_scripts/puppet/manifests/keystone.pp index 5fde88a..72f6d99 100644 --- a/deployment_scripts/puppet/manifests/keystone.pp +++ b/deployment_scripts/puppet/manifests/keystone.pp @@ -1,19 +1,31 @@ notify {'MODULAR fuel-plugin-manila/keystone': } -$manila = hiera_hash('manila', {}) -$pass = $manila['user_password'] +$manila = hiera_hash('manila', {}) +$pass = $manila['user_password'] -$network_metadata = hiera_hash('network_metadata', {}) -$public_ip = $network_metadata['vips']['public']['ipaddr'] -$admin_ip = $network_metadata['vips']['management']['ipaddr'] -$internal_ip = $admin_ip +$public_ssl_hash = hiera_hash('public_ssl') +$ssl_hash = hiera_hash('use_ssl', {}) +$public_vip = hiera('public_vip') +$management_vip = hiera('management_vip') + +$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'manila', 'public', 'protocol', 'http') +$public_address = get_ssl_property($ssl_hash, $public_ssl_hash, 'manila', 'public', 'hostname', [$public_vip]) +$internal_protocol = get_ssl_property($ssl_hash, {}, 'manila', 'internal', 'protocol', 'http') +$internal_address = get_ssl_property($ssl_hash, {}, 'manila', 'internal', 'hostname', [$management_vip]) +$admin_protocol = get_ssl_property($ssl_hash, {}, 'manila', 'admin', 'protocol', 'http') +$admin_address = get_ssl_property($ssl_hash, {}, 'manila', 'admin', 'hostname', [$management_vip]) +$port = '8786' + +$public_base_url = "${public_protocol}://${public_address}:${port}" +$internal_base_url = "${internal_protocol}://${internal_address}:${port}" +$admin_base_url = "${admin_protocol}://${admin_address}:${port}" class {'::manila::keystone::auth': password => $pass, - public_url => "http://${public_ip}:8786/v1/%(tenant_id)s", - public_url_v2 => "http://${public_ip}:8786/v2/%(tenant_id)s", - admin_url => "http://${admin_ip}:8786/v1/%(tenant_id)s", - admin_url_v2 => "http://${admin_ip}:8786/v2/%(tenant_id)s", - internal_url => "http://${internal_ip}:8786/v1/%(tenant_id)s", - internal_url_v2 => "http://${internal_ip}:8786/v2/%(tenant_id)s", + public_url => "${public_base_url}/v1/%(tenant_id)s", + public_url_v2 => "${public_base_url}/v2/%(tenant_id)s", + admin_url => "${admin_base_url}/v1/%(tenant_id)s", + admin_url_v2 => "${admin_base_url}/v2/%(tenant_id)s", + internal_url => "${internal_base_url}/v1/%(tenant_id)s", + internal_url_v2 => "${internal_base_url}/v2/%(tenant_id)s", }