diff options
| author |   Jaume Devesa <devvesa@gmail.com> | 2015-11-27 12:44:05 +0100 |
|---|---|---|
| committer | Jaume Devesa <devvesa@gmail.com> | 2015-12-11 11:46:53 +0000 |
| commit | 7260c13fbeac8bf34da30d70f449412f3628e2f7 (patch) | |
| tree | 9aab3704993aae27d536f132bf4c4ada8d9ccc3c /manifests | |
| parent | 572c786fda11e16f3cceace273c64a2c945ca143 (diff) | |
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
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/cluster/cassandra.pp | 7 | ||||
| -rw-r--r-- | manifests/cluster/zookeeper.pp | 8 | ||||
| -rw-r--r-- | manifests/network/midonet/agent.pp | 9 | ||||
| -rw-r--r-- | manifests/network/midonet/api.pp | 7 |
4 files changed, 25 insertions, 6 deletions
diff --git a/manifests/cluster/cassandra.pp b/manifests/cluster/cassandra.pp index a810ccd..39e6e5e 100644 --- a/manifests/cluster/cassandra.pp +++ b/manifests/cluster/cassandra.pp @@ -52,7 +52,12 @@ class tripleo::cluster::cassandra( $client_port_thrift = '9160' ) { - validate_array($cassandra_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($cassandra_servers) validate_ipv4_address($cassandra_ip) class {'::cassandra::run': diff --git a/manifests/cluster/zookeeper.pp b/manifests/cluster/zookeeper.pp index 6f4adbc..82d21ee 100644 --- a/manifests/cluster/zookeeper.pp +++ b/manifests/cluster/zookeeper.pp @@ -39,9 +39,13 @@ class tripleo::cluster::zookeeper( $zookeeper_hostnames ) { - validate_array($zookeeper_server_ips) + # 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_server_ips) validate_ipv4_address($zookeeper_client_ip) - validate_array($zookeeper_hostnames) + # validate_array($zookeeper_hostnames) # TODO(devvesa) Zookeeper package should provide these paths, # remove this lines as soon as it will. 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) |