openstack/puppet-tripleo
Code Issues Proposed changes

Merge "pass list of memcache servers to keystone::federation::openidc"

Browse Source
This commit is contained in:
Zuul
2019-03-19 20:38:05 +00:00
committed by Gerrit Code Review
parent 0de320a94e a2efd3cbd1
commit c9d107c368
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/profile/base/keystone.pp
View File

@@ -153,6 +153,11 @@
# [*keystone_openidc_enabled*] # [*keystone_openidc_enabled*]
# (Optional) Enable OpenIDC federation # (Optional) Enable OpenIDC federation
# Defaults to hiera('keystone_openidc_enabled', false) # Defaults to hiera('keystone_openidc_enabled', false)
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
#
class tripleo::profile::base::keystone ( class tripleo::profile::base::keystone (
$admin_endpoint_network = hiera('keystone_admin_api_network', undef), $admin_endpoint_network = hiera('keystone_admin_api_network', undef),
$bootstrap_node = hiera('keystone_short_bootstrap_node_name', undef), $bootstrap_node = hiera('keystone_short_bootstrap_node_name', undef),
@@ -185,6 +190,7 @@ class tripleo::profile::base::keystone (
$keystone_enable_member = hiera('keystone_enable_member', false), $keystone_enable_member = hiera('keystone_enable_member', false),
$keystone_federation_enabled = hiera('keystone_federation_enabled', false), $keystone_federation_enabled = hiera('keystone_federation_enabled', false),
$keystone_openidc_enabled = hiera('keystone_openidc_enabled', false), $keystone_openidc_enabled = hiera('keystone_openidc_enabled', false),
$memcached_ips = hiera('memcached_node_ips')
) { ) {
if $::hostname == downcase($bootstrap_node) { if $::hostname == downcase($bootstrap_node) {
$sync_db = true $sync_db = true
@@ -278,7 +284,11 @@ class tripleo::profile::base::keystone (
} }
if $keystone_openidc_enabled { if $keystone_openidc_enabled {
include ::keystone::federation::openidc $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
class { '::keystone::federation::openidc':
memcached_servers => $memcached_servers,
}
} }
} }