x
/
fuel-plugin-contrail
Code Issues Proposed changes

Merge "Remove cassandra seed check"

This commit is contained in:
Jenkins 2016-10-14 10:38:36 +00:00 committed by Gerrit Code Review
parent c85378f015 9aed16cea1
commit 4b284aa1ae
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment_scripts/puppet/modules/contrail/manifests/database.pp
View File

@ -150,21 +150,12 @@ class contrail::database {
subscribe => File['/etc/cassandra/cassandra.yaml']
}
$cassandra_seed = $cassandra_seeds[0]
exec { 'wait_for_cassandra_seed':
provider => 'shell',
command => "nodetool status|grep ^UN|grep ${cassandra_seed}",
tries => 10, # wait for whole cluster is up: 10 tries every 30 seconds = 5 min
try_sleep => 30,
require => Service['supervisor-database'],
}
exec { 'wait_for_cassandra':
provider => 'shell',
command => "nodetool status|grep ^UN|grep ${contrail::address}",
tries => 10, # wait for whole cluster is up: 10 tries every 30 seconds = 5 min
try_sleep => 30,
require => [Service['supervisor-database'],Exec['wait_for_cassandra_seed']]
require => Exec['wait_for_cassandra_seed']
}
Package['contrail-openstack-database'] -> Contrail_database_nodemgr_config <||>
Contrail_database_nodemgr_config <||> ~> Service['supervisor-database']