← Back to branch summary

~joeborg/charms/trusty/contrail-configuration/rbac-switch

« back to all changes in this revision

Viewing changes to hooks/contrail_configuration_hooks.py

  • Committer: Robert Ayres
  • Date: 2017-07-17 04:44:08 UTC
  • Revision ID: robert.ayres@canonical.com-20170717044408-jyxzpkgi1u707x88
Add ability to configure encapsulation priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/contrail_configuration_hooks.py
44
44
    CONTRAIL_VERSION,
45
45
    api_port,
46
46
    cassandra_units,
 
47
    contrail_encap_priority_set,
 
48
    contrail_encap_priority_unset,
47
49
    contrail_floating_ip_create,
48
50
    contrail_floating_ip_deactivate,
49
51
    contrail_floating_ip_delete,
102
104
        for rid in relation_ids("contrail-api"):
103
105
            relation_set(relation_id=rid, relation_settings=settings)
104
106
 
 
107
        configure_encap_priority()
105
108
        configure_floating_ip_pools()
106
109
 
107
110
def add_metadata():
193
196
    if config.get("contrail-api-configured"):
194
197
        wait_for_contrail_api()
195
198
        configure_control_network()
 
199
        configure_encap_priority()
196
200
        configure_floating_ip_pools()
197
201
 
198
202
    ip = control_network_ip()
234
238
            unprovision_configuration()
235
239
            provision_configuration()
236
240
 
 
241
def configure_encap_priority():
 
242
    if is_leader():
 
243
        priority = config.get("encap-priority")
 
244
        if priority:
 
245
            contrail_encap_priority_set(priority)
 
246
        else:
 
247
            contrail_encap_priority_unset()
 
248
 
237
249
def configure_floating_ip_pools():
238
250
    if is_leader():
239
251
        floating_pools = config.get("floating-ip-pools")