openstack
/
puppet-tripleo
Code Issues Proposed changes

Add ability to specify memcached port 

The port defaults to hiera('memcached_authtoken_port', 11211)
for authtoken middleware and hiera('memcached_port', 11211)
for other uses. Different ports might be set for security
and performance tuning.

Change-Id: I567d6b2cd66d5eb98971cd54987c1fbea3c1da78
This commit is contained in:
Grzegorz Grasza 2021-01-05 11:45:57 +01:00
parent 197c12e6aa
commit f460e659ba
23 changed files with 151 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/aodh/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::aodh::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'aodh::keystone::authtoken':

9
manifests/profile/base/barbican/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::barbican::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'barbican::keystone::authtoken':

9
manifests/profile/base/cinder/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::cinder::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'cinder::keystone::authtoken':

9
manifests/profile/base/designate/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::designate::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'designate::keystone::authtoken':

9
manifests/profile/base/glance/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::glance::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'glance::api::authtoken':

9
manifests/profile/base/gnocchi/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::gnocchi::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'gnocchi::keystone::authtoken':

9
manifests/profile/base/heat.pp
View File

@ -83,6 +83,10 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # Defaults to hiera('memcached_node_ips', [])
# #
# [*memcached_port*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_port', 11211)
#
class tripleo::profile::base::heat ( class tripleo::profile::base::heat (
$bootstrap_node = downcase(hiera('heat_engine_short_bootstrap_node_name')), $bootstrap_node = downcase(hiera('heat_engine_short_bootstrap_node_name')),
$manage_db_purge = hiera('heat_enable_db_purge', true), $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_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'), $oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_port', 11211),
) { ) {
include tripleo::profile::base::heat::authtoken include tripleo::profile::base::heat::authtoken
@ -139,9 +144,9 @@ class tripleo::profile::base::heat (
include heat::logging include heat::logging
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'heat::cache':

9
manifests/profile/base/heat/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::heat::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'heat::keystone::authtoken':

9
manifests/profile/base/ironic/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::ironic::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'ironic::api::authtoken':

9
manifests/profile/base/ironic_inspector/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::ironic_inspector::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'ironic::inspector::authtoken':

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

@ -158,6 +158,10 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # Defaults to hiera('memcached_node_ips', [])
# #
# [*memcached_port*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_port', 11211)
#
# [*keystone_resources_managed*] # [*keystone_resources_managed*]
# (Optional) Enable the management of Keystone resources with Puppet. # (Optional) Enable the management of Keystone resources with Puppet.
# Can be disabled if Ansible manages these resources instead of 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_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', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_port', 11211),
$keystone_resources_managed = hiera('keystone_resources_managed', undef), $keystone_resources_managed = hiera('keystone_resources_managed', undef),
) { ) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) { 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 ) { if $step >= 4 or ( $step >= 3 and $sync_db ) {
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl))) $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))) $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': class { 'keystone::cache':
memcache_servers => $memcached_servers, memcache_servers => $memcached_servers,

9
manifests/profile/base/manila/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::manila::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'manila::keystone::authtoken':

9
manifests/profile/base/mistral/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::mistral::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'mistral::keystone::authtoken':

9
manifests/profile/base/neutron/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::neutron::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'neutron::keystone::authtoken':

9
manifests/profile/base/nova.pp
View File

@ -78,6 +78,10 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # Defaults to hiera('memcached_node_ips', [])
# #
# [*memcached_port*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_port', 11211)
#
class tripleo::profile::base::nova ( class tripleo::profile::base::nova (
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef), $bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'), $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'), $oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_port', 11211),
) { ) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@ -103,9 +108,9 @@ class tripleo::profile::base::nova (
} }
if is_ipv6_address($memcached_ips[0]) { 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 { } 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) { if $step >= 4 or ($step >= 3 and $sync_db) {

9
manifests/profile/base/nova/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::nova::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'nova::keystone::authtoken':

9
manifests/profile/base/novajoin/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::novajoin::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'nova::metadata::novajoin::authtoken':

9
manifests/profile/base/octavia/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::octavia::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'octavia::keystone::authtoken':

9
manifests/profile/base/placement/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::placement::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'placement::keystone::authtoken':

6
manifests/profile/base/swift.pp
View File

@ -24,8 +24,8 @@
# Defaults to hiera('step') # Defaults to hiera('step')
# #
# [*memcache_port*] # [*memcache_port*]
# (Optional) memcache port # (Optional) Memcached port to use.
# Defaults to 11211 # Defaults to hiera('memcached_port', 11211)
# #
# [*memcache_servers*] # [*memcache_servers*]
# (Optional) List of memcache servers # (Optional) List of memcache servers
@ -33,7 +33,7 @@
# #
class tripleo::profile::base::swift ( class tripleo::profile::base::swift (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcache_port = 11211, $memcache_port = hiera('memcached_port', 11211),
$memcache_servers = hiera('memcached_node_ips', []), $memcache_servers = hiera('memcached_node_ips', []),
) { ) {
if $step >= 4 { if $step >= 4 {

6
manifests/profile/base/swift/proxy.pp
View File

@ -67,8 +67,8 @@
# Defaults to hiera('enable_internal_tls', false) # Defaults to hiera('enable_internal_tls', false)
# #
# [*memcache_port*] # [*memcache_port*]
# (Optional) memcache port # (Optional) Memcached port to use.
# Defaults to 11211 # Defaults to hiera('memcached_port', 11211)
# #
# [*memcache_servers*] # [*memcache_servers*]
# (Optional) List of 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'), $oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'),
$certificates_specs = hiera('apache_certificates_specs', {}), $certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false), $enable_internal_tls = hiera('enable_internal_tls', false),
$memcache_port = 11211, $memcache_port = hiera('memcached_port', 11211),
$memcache_servers = hiera('memcached_node_ips', []), $memcache_servers = hiera('memcached_node_ips', []),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$swift_proxy_network = hiera('swift_proxy_network', undef), $swift_proxy_network = hiera('swift_proxy_network', undef),

9
manifests/profile/base/zaqar/authtoken.pp
View File

@ -25,16 +25,21 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips', []) # 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 ( class tripleo::profile::base::zaqar::authtoken (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips', []), $memcached_ips = hiera('memcached_node_ips', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
) { ) {
if $step >= 3 { if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) { 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 { } 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': class { 'zaqar::keystone::authtoken':

6
releasenotes/notes/add-memcached-port-048959c2f58f0a57.yaml Normal file
View File

@ -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.