Merge lp:~heut2008/charms/trusty/nova-cloud-controller/fix-vip-issue into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Yaguang Tang]

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-07-29 12:25:27 +0000
+++ hooks/nova_cc_hooks.py	2014-07-31 02:08:35 +0000
@@ -536,6 +536,13 @@
     if not clustered or clustered in [None, 'None', '']:
         log('ha_changed: hacluster subordinate not fully clustered.')
         return
+
+    CONFIGS.write(NOVA_CONF)
+    if network_manager() == 'quantum':
+        CONFIGS.write(QUANTUM_CONF)
+    if network_manager() == 'neutron':
+        CONFIGS.write(NEUTRON_CONF)
+
     if not is_leader(CLUSTER_RES):
         log('ha_changed: hacluster complete but we are not leader.')
         return