openstack
/
puppet-tripleo
Code Issues Proposed changes

Accept missing memcached_node_ips 

Currently when Memcached is disabled in the deployment, puppet-tripleo
fails because some manifests expect that memcached_node_ips is defined
in hieradata.

This patch ensures that we define the default value ([]) for
memcached_node_ips, so that puppet-tripleo doesn't fail even if
the parameter doesn't appear in heradata.

Change-Id: I6d3e32f7f8f0751bdfbd0b6f2e79c5d85e1af284
This commit is contained in:
Takashi Kajinami 2020-05-03 00:44:55 +09:00
parent b7ec567884
commit e2ea1206c8
22 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::aodh::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::barbican::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::cinder::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::designate::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::glance::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::gnocchi::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -81,7 +81,7 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::heat (
$bootstrap_node = downcase(hiera('heat_engine_short_bootstrap_node_name')),
@ -99,7 +99,7 @@ class tripleo::profile::base::heat (
$oslomsg_notify_port = hiera('oslo_messaging_notify_port', '5672'),
$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_ips = hiera('memcached_node_ips', []),
) {
include tripleo::profile::base::heat::authtoken

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::heat::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

4
manifests/profile/base/horizon.pp
View File

@ -54,7 +54,7 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::horizon (
$step = Integer(hiera('step')),
@ -63,7 +63,7 @@ class tripleo::profile::base::horizon (
$enable_internal_tls = hiera('enable_internal_tls', false),
$horizon_network = hiera('horizon_network', undef),
$neutron_options = hiera('horizon::neutron_options', {}),
$memcached_ips = hiera('memcached_node_ips')
$memcached_ips = hiera('memcached_node_ips', [])
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::ironic::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::ironic_inspector::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -156,7 +156,7 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
# [*keystone_resources_managed*]
# (Optional) Enable the management of Keystone resources with Puppet.

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::manila::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::mistral::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::neutron::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -76,7 +76,7 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::nova (
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
@ -93,7 +93,7 @@ class tripleo::profile::base::nova (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::nova::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::novajoin::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::octavia::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::placement::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {

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

@ -72,7 +72,7 @@
#
# [*memcache_servers*]
# (Optional) List of memcache servers
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -111,7 +111,7 @@ class tripleo::profile::base::swift::proxy (
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$memcache_port = 11211,
$memcache_servers = hiera('memcached_node_ips'),
$memcache_servers = hiera('memcached_node_ips', []),
$step = Integer(hiera('step')),
$swift_proxy_network = hiera('swift_proxy_network', undef),
$tls_proxy_bind_ip = undef,

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

@ -23,11 +23,11 @@
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
# Defaults to hiera('memcached_node_ips', [])
#
class tripleo::profile::base::zaqar::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
$memcached_ips = hiera('memcached_node_ips', []),
) {
if $step >= 3 {