aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/cluster/cassandra.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/cluster/cassandra.pp')
-rw-r--r--manifests/cluster/cassandra.pp26
1 files changed, 15 insertions, 11 deletions
diff --git a/manifests/cluster/cassandra.pp b/manifests/cluster/cassandra.pp
index a810ccd..b20926b 100644
--- a/manifests/cluster/cassandra.pp
+++ b/manifests/cluster/cassandra.pp
@@ -52,18 +52,22 @@ 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':
- seeds => $cassandra_servers,
- seed_address => $cassandra_ip,
- conf_dir => '/etc/cassandra/default.conf',
- pid_dir => '/var/run/cassandra',
- service_path => '/sbin',
- storage_port => $storage_port,
- ssl_storage_port => $ssl_storage_port,
- client_port => $client_port,
- client_port_thrift => $client_port_thrift
+ class {'::cassandra':
+ cluster_name => 'TripleO',
+ seeds => $cassandra_servers,
+ listen_address => $cassandra_ip,
+ storage_port => $storage_port,
+ ssl_storage_port => $ssl_storage_port,
+ native_transport_port => $client_port,
+ rpc_port => $client_port_thrift
}
+
}