← Back to branch summary

~vds/charms/trusty/contrail-configuration/TLS_support_for_RabbitMQ_connection

« back to all changes in this revision

Viewing changes to hooks/contrail_configuration_hooks.py

  • Committer: Robert Ayres
  • Date: 2016-02-09 23:42:04 UTC
  • Revision ID: robert.ayres@canonical.com-20160209234204-xl0ipamrdawoq06d
Add option for minimum number of cassandra units before proceeding, fixes lp #1541793

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/contrail_configuration_hooks.py
41
41
 
42
42
from contrail_configuration_utils import (
43
43
    api_port,
 
44
    cassandra_units,
44
45
    check_url,
45
46
    contrail_floating_ip_create,
46
47
    contrail_floating_ip_deactivate,
136
137
    if not relation_get("rpc_port") and not relation_get("port"):
137
138
        log("Relation not ready")
138
139
        return
139
 
    cassandra_relation()
 
140
    if not config.get("cassandra-ready"):
 
141
        units = len(cassandra_units())
 
142
        required = config["cassandra-units"]
 
143
        if units < required:
 
144
            log("{} cassandra unit(s) ready, require {} more".format(units, required - units))
 
145
            return
140
146
    config["cassandra-ready"] = True
 
147
    cassandra_relation()
141
148
    add_contrail_api()
142
149
    add_metadata()
143
150