From 7260c13fbeac8bf34da30d70f449412f3628e2f7 Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Fri, 27 Nov 2015 12:44:05 +0100 Subject: Remove all 'validate_array' statements Unfortunately, some distributions like CentOS 7 (I guess RedHat 7 as well) still using puppet < 3.7, which experience the annoying 'PUP-1299' bug: https://tickets.puppetlabs.com/browse/PUP-1299 So passing a single array element, it magically transforms to a string (or whatever the inside elements are) and the validate_array fails. We need to get rid of these validations. Change-Id: Icc22ee575b7c236d1a6358f8593cf813d339a4b5 --- manifests/network/midonet/agent.pp | 9 +++++++-- manifests/network/midonet/api.pp | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'manifests/network') diff --git a/manifests/network/midonet/agent.pp b/manifests/network/midonet/agent.pp index 2f1da94..0e65282 100644 --- a/manifests/network/midonet/agent.pp +++ b/manifests/network/midonet/agent.pp @@ -33,8 +33,13 @@ class tripleo::network::midonet::agent ( $cassandra_seeds ) { - validate_array($zookeeper_servers) - validate_array($cassandra_seeds) + # TODO: Remove comments below once we can guarantee that all the distros + # deploying TripleO use Puppet > 3.7 because of this bug: + # https://tickets.puppetlabs.com/browse/PUP-1299 + + # validate_array($zookeeper_servers) + # validate_array($cassandra_seeds) + # FIXME: This statement should be controlled by hiera on heat templates # project diff --git a/manifests/network/midonet/api.pp b/manifests/network/midonet/api.pp index 33b2217..83efd2c 100644 --- a/manifests/network/midonet/api.pp +++ b/manifests/network/midonet/api.pp @@ -78,7 +78,12 @@ class tripleo::network::midonet::api( $admin_tenant_name = 'admin' ) { - validate_array($zookeeper_servers) + + # TODO: Remove this comment once we can guarantee that all the distros + # deploying TripleO use Puppet > 3.7 because of this bug: + # https://tickets.puppetlabs.com/browse/PUP-1299 + + # validate_array($zookeeper_servers) validate_ip_address($vip) validate_ip_address($keystone_ip) validate_ip_address($bind_address) -- cgit 1.2.3-korg