diff --git a/manifests/profile/base/aodh/authtoken.pp b/manifests/profile/base/aodh/authtoken.pp index 34ac7d66f..cd6a4b097 100644 --- a/manifests/profile/base/aodh/authtoken.pp +++ b/manifests/profile/base/aodh/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::aodh::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/barbican/authtoken.pp b/manifests/profile/base/barbican/authtoken.pp index ad7acdac4..1e8e82b8c 100644 --- a/manifests/profile/base/barbican/authtoken.pp +++ b/manifests/profile/base/barbican/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::barbican::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/cinder/authtoken.pp b/manifests/profile/base/cinder/authtoken.pp index 4a21c9c08..1ead22b25 100644 --- a/manifests/profile/base/cinder/authtoken.pp +++ b/manifests/profile/base/cinder/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::cinder::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/designate/authtoken.pp b/manifests/profile/base/designate/authtoken.pp index abb8570a9..526f869ef 100644 --- a/manifests/profile/base/designate/authtoken.pp +++ b/manifests/profile/base/designate/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::designate::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/glance/authtoken.pp b/manifests/profile/base/glance/authtoken.pp index 6d3579460..cf39e0189 100644 --- a/manifests/profile/base/glance/authtoken.pp +++ b/manifests/profile/base/glance/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::glance::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/gnocchi/authtoken.pp b/manifests/profile/base/gnocchi/authtoken.pp index 56cd90b64..c23993a1f 100644 --- a/manifests/profile/base/gnocchi/authtoken.pp +++ b/manifests/profile/base/gnocchi/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::gnocchi::authtoken ( 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}") } if $secret_key { 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 1c509ff2f..b1b20bfff 100644 --- a/manifests/profile/base/heat/authtoken.pp +++ b/manifests/profile/base/heat/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::heat::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/ironic/authtoken.pp b/manifests/profile/base/ironic/authtoken.pp index 3b53162da..a62a54213 100644 --- a/manifests/profile/base/ironic/authtoken.pp +++ b/manifests/profile/base/ironic/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::ironic::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/ironic_inspector/authtoken.pp b/manifests/profile/base/ironic_inspector/authtoken.pp index f50cd9b52..5edf8b4f3 100644 --- a/manifests/profile/base/ironic_inspector/authtoken.pp +++ b/manifests/profile/base/ironic_inspector/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::ironic_inspector::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index ab8804caa..4adf5001f 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': sync_db => $sync_db, diff --git a/manifests/profile/base/manila/authtoken.pp b/manifests/profile/base/manila/authtoken.pp index 629f3a5f4..96f3bd185 100644 --- a/manifests/profile/base/manila/authtoken.pp +++ b/manifests/profile/base/manila/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::manila::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/mistral/authtoken.pp b/manifests/profile/base/mistral/authtoken.pp index fc6a44a8f..a77f55578 100644 --- a/manifests/profile/base/mistral/authtoken.pp +++ b/manifests/profile/base/mistral/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::mistral::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/neutron/authtoken.pp b/manifests/profile/base/neutron/authtoken.pp index 2f710e685..34b8ef4c9 100644 --- a/manifests/profile/base/neutron/authtoken.pp +++ b/manifests/profile/base/neutron/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::neutron::authtoken ( 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}") } if $secret_key { 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 154545c0b..011fa828a 100644 --- a/manifests/profile/base/nova/authtoken.pp +++ b/manifests/profile/base/nova/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::nova::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/novajoin/authtoken.pp b/manifests/profile/base/novajoin/authtoken.pp index e2397248b..6d8304451 100644 --- a/manifests/profile/base/novajoin/authtoken.pp +++ b/manifests/profile/base/novajoin/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::novajoin::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/octavia/authtoken.pp b/manifests/profile/base/octavia/authtoken.pp index 09bbfb199..ae8f42885 100644 --- a/manifests/profile/base/octavia/authtoken.pp +++ b/manifests/profile/base/octavia/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::octavia::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/placement/authtoken.pp b/manifests/profile/base/placement/authtoken.pp index 5db9aaabc..412ec8b44 100644 --- a/manifests/profile/base/placement/authtoken.pp +++ b/manifests/profile/base/placement/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::placement::authtoken ( 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}") } if $secret_key { diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index d32a79222..afd3a5591 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 3eed09f0b..ab44e21bb 100644 --- a/manifests/profile/base/zaqar/authtoken.pp +++ b/manifests/profile/base/zaqar/authtoken.pp @@ -48,9 +48,9 @@ class tripleo::profile::base::zaqar::authtoken ( 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}") } if $secret_key { 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.