diff --git a/manifests/profile/base/aodh/authtoken.pp b/manifests/profile/base/aodh/authtoken.pp index 152d62766..785d55422 100644 --- a/manifests/profile/base/aodh/authtoken.pp +++ b/manifests/profile/base/aodh/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::aodh::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'aodh::keystone::authtoken': diff --git a/manifests/profile/base/barbican/authtoken.pp b/manifests/profile/base/barbican/authtoken.pp index eac15f923..95af9d6c8 100644 --- a/manifests/profile/base/barbican/authtoken.pp +++ b/manifests/profile/base/barbican/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', []) +# class tripleo::profile::base::barbican::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'barbican::keystone::authtoken': diff --git a/manifests/profile/base/cinder/authtoken.pp b/manifests/profile/base/cinder/authtoken.pp index 531714ce0..c4edf001e 100644 --- a/manifests/profile/base/cinder/authtoken.pp +++ b/manifests/profile/base/cinder/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::cinder::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'cinder::keystone::authtoken': diff --git a/manifests/profile/base/designate/authtoken.pp b/manifests/profile/base/designate/authtoken.pp index 2c5019422..d5856c2cc 100644 --- a/manifests/profile/base/designate/authtoken.pp +++ b/manifests/profile/base/designate/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::designate::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'designate::keystone::authtoken': diff --git a/manifests/profile/base/glance/authtoken.pp b/manifests/profile/base/glance/authtoken.pp index d4670f012..0ab02f2c8 100644 --- a/manifests/profile/base/glance/authtoken.pp +++ b/manifests/profile/base/glance/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::glance::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'glance::api::authtoken': diff --git a/manifests/profile/base/gnocchi/authtoken.pp b/manifests/profile/base/gnocchi/authtoken.pp index b0d213a40..40f106b75 100644 --- a/manifests/profile/base/gnocchi/authtoken.pp +++ b/manifests/profile/base/gnocchi/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::gnocchi::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'gnocchi::keystone::authtoken': diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 9afe35a49..e35730994 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -83,6 +83,10 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_port', 11211) +# class tripleo::profile::base::heat ( $bootstrap_node = downcase(hiera('heat_engine_short_bootstrap_node_name')), $manage_db_purge = hiera('heat_enable_db_purge', true), @@ -100,6 +104,7 @@ class tripleo::profile::base::heat ( $oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'), $oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_port', 11211), ) { include tripleo::profile::base::heat::authtoken @@ -139,9 +144,9 @@ class tripleo::profile::base::heat ( include heat::logging if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'heat::cache': diff --git a/manifests/profile/base/heat/authtoken.pp b/manifests/profile/base/heat/authtoken.pp index 908eb99eb..1a1419688 100644 --- a/manifests/profile/base/heat/authtoken.pp +++ b/manifests/profile/base/heat/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::heat::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'heat::keystone::authtoken': diff --git a/manifests/profile/base/ironic/authtoken.pp b/manifests/profile/base/ironic/authtoken.pp index a97d07b6b..0c861afe6 100644 --- a/manifests/profile/base/ironic/authtoken.pp +++ b/manifests/profile/base/ironic/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::ironic::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'ironic::api::authtoken': diff --git a/manifests/profile/base/ironic_inspector/authtoken.pp b/manifests/profile/base/ironic_inspector/authtoken.pp index 66608df79..85ee9a4f7 100644 --- a/manifests/profile/base/ironic_inspector/authtoken.pp +++ b/manifests/profile/base/ironic_inspector/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::ironic_inspector::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'ironic::inspector::authtoken': diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 69464f3ba..6be2abe48 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -158,6 +158,10 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_port', 11211) +# # [*keystone_resources_managed*] # (Optional) Enable the management of Keystone resources with Puppet. # Can be disabled if Ansible manages these resources instead of Puppet. @@ -199,6 +203,7 @@ class tripleo::profile::base::keystone ( $keystone_federation_enabled = hiera('keystone_federation_enabled', false), $keystone_openidc_enabled = hiera('keystone_openidc_enabled', false), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_port', 11211), $keystone_resources_managed = hiera('keystone_resources_managed', undef), ) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) { @@ -225,7 +230,7 @@ class tripleo::profile::base::keystone ( if $step >= 4 or ( $step >= 3 and $sync_db ) { $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl))) $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl))) - $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") class { 'keystone::cache': memcache_servers => $memcached_servers, diff --git a/manifests/profile/base/manila/authtoken.pp b/manifests/profile/base/manila/authtoken.pp index ea1fb204c..9fa8c0173 100644 --- a/manifests/profile/base/manila/authtoken.pp +++ b/manifests/profile/base/manila/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::manila::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'manila::keystone::authtoken': diff --git a/manifests/profile/base/mistral/authtoken.pp b/manifests/profile/base/mistral/authtoken.pp index fdd8039b6..19d50d483 100644 --- a/manifests/profile/base/mistral/authtoken.pp +++ b/manifests/profile/base/mistral/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::mistral::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'mistral::keystone::authtoken': diff --git a/manifests/profile/base/neutron/authtoken.pp b/manifests/profile/base/neutron/authtoken.pp index f9afa91be..1308cf121 100644 --- a/manifests/profile/base/neutron/authtoken.pp +++ b/manifests/profile/base/neutron/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::neutron::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'neutron::keystone::authtoken': diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 6af689604..880f4c4d2 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -78,6 +78,10 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_port', 11211) +# class tripleo::profile::base::nova ( $bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef), $oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'), @@ -94,6 +98,7 @@ class tripleo::profile::base::nova ( $oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'), $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_port', 11211), ) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) { @@ -103,9 +108,9 @@ class tripleo::profile::base::nova ( } if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } if $step >= 4 or ($step >= 3 and $sync_db) { diff --git a/manifests/profile/base/nova/authtoken.pp b/manifests/profile/base/nova/authtoken.pp index 0a0b453ea..6d311f0ba 100644 --- a/manifests/profile/base/nova/authtoken.pp +++ b/manifests/profile/base/nova/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::nova::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'nova::keystone::authtoken': diff --git a/manifests/profile/base/novajoin/authtoken.pp b/manifests/profile/base/novajoin/authtoken.pp index 5ee9a6f23..095fc17d0 100644 --- a/manifests/profile/base/novajoin/authtoken.pp +++ b/manifests/profile/base/novajoin/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::novajoin::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'nova::metadata::novajoin::authtoken': diff --git a/manifests/profile/base/octavia/authtoken.pp b/manifests/profile/base/octavia/authtoken.pp index a2363b7ed..f06764753 100644 --- a/manifests/profile/base/octavia/authtoken.pp +++ b/manifests/profile/base/octavia/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::octavia::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'octavia::keystone::authtoken': diff --git a/manifests/profile/base/placement/authtoken.pp b/manifests/profile/base/placement/authtoken.pp index ced86f9b0..c9806946c 100644 --- a/manifests/profile/base/placement/authtoken.pp +++ b/manifests/profile/base/placement/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::placement::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'placement::keystone::authtoken': diff --git a/manifests/profile/base/swift.pp b/manifests/profile/base/swift.pp index a0ea8aa42..864af48f4 100644 --- a/manifests/profile/base/swift.pp +++ b/manifests/profile/base/swift.pp @@ -24,8 +24,8 @@ # Defaults to hiera('step') # # [*memcache_port*] -# (Optional) memcache port -# Defaults to 11211 +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_port', 11211) # # [*memcache_servers*] # (Optional) List of memcache servers @@ -33,7 +33,7 @@ # class tripleo::profile::base::swift ( $step = Integer(hiera('step')), - $memcache_port = 11211, + $memcache_port = hiera('memcached_port', 11211), $memcache_servers = hiera('memcached_node_ips', []), ) { if $step >= 4 { diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 8de904f96..1eb37f6d3 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -67,8 +67,8 @@ # Defaults to hiera('enable_internal_tls', false) # # [*memcache_port*] -# (Optional) memcache port -# Defaults to 11211 +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_port', 11211) # # [*memcache_servers*] # (Optional) List of memcache servers @@ -110,7 +110,7 @@ class tripleo::profile::base::swift::proxy ( $oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'), $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), - $memcache_port = 11211, + $memcache_port = hiera('memcached_port', 11211), $memcache_servers = hiera('memcached_node_ips', []), $step = Integer(hiera('step')), $swift_proxy_network = hiera('swift_proxy_network', undef), diff --git a/manifests/profile/base/zaqar/authtoken.pp b/manifests/profile/base/zaqar/authtoken.pp index 3baa0aa5d..f3e95d804 100644 --- a/manifests/profile/base/zaqar/authtoken.pp +++ b/manifests/profile/base/zaqar/authtoken.pp @@ -25,16 +25,21 @@ # (Optional) Array of ipv4 or ipv6 addresses for memcache. # Defaults to hiera('memcached_node_ips', []) # +# [*memcached_port*] +# (Optional) Memcached port to use. +# Defaults to hiera('memcached_authtoken_port', 11211) +# class tripleo::profile::base::zaqar::authtoken ( $step = Integer(hiera('step')), $memcached_ips = hiera('memcached_node_ips', []), + $memcached_port = hiera('memcached_authtoken_port', 11211), ) { if $step >= 3 { if is_ipv6_address($memcached_ips[0]) { - $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}"), 'inet6:') } else { - $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") } class { 'zaqar::keystone::authtoken': diff --git a/releasenotes/notes/add-memcached-port-048959c2f58f0a57.yaml b/releasenotes/notes/add-memcached-port-048959c2f58f0a57.yaml new file mode 100644 index 000000000..91fd9c664 --- /dev/null +++ b/releasenotes/notes/add-memcached-port-048959c2f58f0a57.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Add ability to specify memcached port for all services. The port defaults + to hiera('memcached_authtoken_port', 11211) for authtoken middleware and + hiera('memcached_port', 11211) for other uses.