Use VIP for Apache on ha-changed relation

2014-03-02 09:56:04 +01:00
parent 38bfc0e54f
commit 5772e67467
3 changed files with 5 additions and 1 deletions
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -432,6 +432,9 @@ class ApacheSSLContext(OSContextGenerator):
            'private_address': unit_get('private-address'),
            'endpoints': []
        }
+        vip = config('vip')
+        if is_clustered() and vip:
+            ctxt['private_address'] = vip
        for api_port in self.external_ports:
            ext_port = determine_apache_port(api_port)
            int_port = determine_api_port(api_port)
--- a/hooks/keystone_hooks.py
+++ b/hooks/keystone_hooks.py
@@ -186,6 +186,7 @@ def ha_changed():
    if (clustered is not None and
        is_leader(CLUSTER_RES)):
        ensure_initial_admin(config)
+        CONFIGS.write_all()
        log('Cluster configured, notifying other services and updating '
            'keystone endpoint configuration')
        for rid in relation_ids('identity-service'):
--- a/2
+++ b/2
@@ -1 +1 @@
-230
+231