keystone_changed: Protect late quantum config by an eligible_leader check.

2013-03-08 18:37:34 -08:00 · 2013-03-08 18:37:34 -08:00 · 19b4ca3e55
parent 0eddd647fd
commit 19b4ca3e55
2 changed files with 3 additions and 2 deletions
--- a/hooks/nova-cloud-controller-relations
+++ b/hooks/nova-cloud-controller-relations
@ -368,7 +368,8 @@ EOF
  # if this changed event happens as a result of clustered VIP
  # reconfigure, configure_https needs to update VIP certificate
  # before quantumclient is used.
-  [[ -n "$clustered" ]] && configure_quantum_networking
+  [[ "$NET_MANAGER" == "Quantum" ]] && [[ -n "$clustered" ]] &&
+    eligible_leader 'res_nova_vip' && configure_quantum_networking
 }

 volume_joined() {
--- a/2
+++ b/2
@ -1 +1 @@
-232
+234