openstack
/
puppet-tripleo
Code Issues Proposed changes

Modify cassandra dependency 

Switch to locp/cassandra module since it has much more options than
midonet/puppet-cassandra and it is already defined on the
openstack-puppet-modules packages in RHEL. More info:

https://bugzilla.redhat.com/show_bug.cgi?id=1285718

Depends-On: I72f21036fda795b54312a7d39f04c30bbf16c41b
Change-Id: Icea9bd96e4c80a26b9e813d383f84099c736d7bf
This commit is contained in:
Jaume Devesa 2015-11-30 12:53:55 +01:00
parent b94e93d8c8
commit d7e457b8af
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.fixtures.yml
View File

@ -12,8 +12,8 @@ fixtures:
repo: 'git://github.com/puppetlabs/puppetlabs-inifile.git'
ref: '1.4.2'
'cassandra':
repo: 'git://github.com/midonet/puppet-cassandra.git'
ref: 'v1.1.1'
repo: 'git://github.com/locp/cassandra.git'
ref: '1.9.2'
'zookeeper':
repo: 'git://github.com/deric/puppet-zookeeper.git'
ref: 'v0.3.9'

19
manifests/cluster/cassandra.pp
View File

@ -60,15 +60,14 @@ class tripleo::cluster::cassandra(
# 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
}
}

23
spec/classes/tripleo_cluster_cassandra_spec.rb
View File

@ -21,6 +21,14 @@ describe 'tripleo::cluster::cassandra' do
shared_examples_for 'cassandra cluster service' do
let :facts do
{
:hostname => 'host1.midonet',
:osfamily => 'RedHat',
:operatingsystemmajrelease => 7,
}
end
let :params do
{
:cassandra_servers => ['192.168.2.2', '192.168.2.3'],
@ -29,14 +37,15 @@ describe 'tripleo::cluster::cassandra' do
end
it 'should configure cassandra' do
is_expected.to contain_class('cassandra::run').with(
:seeds => ['192.168.2.2', '192.168.2.3'],
:seed_address => '192.168.2.2',
:storage_port => '7000',
:ssl_storage_port => '7001',
:client_port => '9042',
:client_port_thrift => '9160'
is_expected.to contain_class('cassandra').with(
:seeds => ['192.168.2.2', '192.168.2.3'],
:listen_address => '192.168.2.2',
:storage_port => 7000,
:ssl_storage_port => 7001,
:native_transport_port => 9042,
:rpc_port => 9160
)
end
end