diff --git a/hooks/lib/nova/nova-common b/hooks/lib/nova/nova-common
index 2641e045..db017b92 100644
--- a/hooks/lib/nova/nova-common
+++ b/hooks/lib/nova/nova-common
@@ -2,6 +2,8 @@
 
 # Common utility functions used across all nova charms.
 
+CONFIG_CHANGED=False
+
 # Load the common OpenStack helper library.
 if [[ -e $CHARM_DIR/lib/openstack-common ]] ; then
   . $CHARM_DIR/lib/openstack-common
diff --git a/hooks/lib/openstack-common b/hooks/lib/openstack-common
index 1338d060..77ce75e7 100644
--- a/hooks/lib/openstack-common
+++ b/hooks/lib/openstack-common
@@ -49,9 +49,10 @@ function service_ctl {
       juju-log "$CHARM: service_ctl ERROR - Service $i failed to $action"
     fi
   done
-  # all configs should have been reloaded on restart, reset flag if its
-  # being used.
-  if [[ "$action" == "restart" ]] && [[ -n "$CONFIG_CHANGED" ]]; then
+  # all configs should have been reloaded on restart of all services, reset
+  # flag if its being used.
+  if [[ "$action" == "restart" ]] && [[ -n "$CONFIG_CHANGED" ]] &&
+     [[ "$ctl" == "all" ]]; then
     CONFIG_CHANGED="False"
   fi
 }
diff --git a/revision b/revision
index eb08bc0b..4fc233b7 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-240
+261