diff --git a/hooks/nova-cloud-controller-common b/hooks/nova-cloud-controller-common
index 91350024..0c9316e5 100755
--- a/hooks/nova-cloud-controller-common
+++ b/hooks/nova-cloud-controller-common
@@ -70,7 +70,7 @@ function determine_packages {
       "nvp") PACKAGES="$PACKAGES quantum-plugin-nicira" ;;
     esac
   fi
-  echo "DETERMINED PACKAGES: $PACKAGES"
+  juju-log "$CHARM: Determined required packages: $PACKAGES."
 }
 
 function determine_quantum_config {
@@ -93,6 +93,7 @@ function determine_quantum_config {
 }
 
 function configure_quantum_networking {
+  determine_quantum_config
   if [ "$(config-get conf-ext-net)" != "no" ] &&
      [ "$QUANTUM_PLUGIN" == "ovs" ] &&
      [ -f /etc/quantum/novarc ] &&
diff --git a/hooks/nova-cloud-controller-relations b/hooks/nova-cloud-controller-relations
index b76b88c6..a6f14d27 100755
--- a/hooks/nova-cloud-controller-relations
+++ b/hooks/nova-cloud-controller-relations
@@ -19,6 +19,9 @@ function install_hook {
   DEBIAN_FRONTEND=noninteractive apt-get -y \
     install --no-install-recommends $PACKAGES || exit 1
 
+  if [[ "$NET_MANAGER" == "Quantum" ]] ; then
+    determine_quantum_config
+  fi
   configure_network_manager $NET_MANAGER
 
   # Configure any flags specified in deployment config
@@ -147,6 +150,7 @@ function db_changed {
 
   if [ "$NET_MANAGER" == "Quantum" ]; then
     local quantum_db_password=`relation-get quantum_password`
+    determine_quantum_config
     set_or_update sql_connection "mysql://quantum:$quantum_db_password@$db_host/quantum?charset=utf8" \
       $QUANTUM_PLUGIN_CONF "DATABASE"
   fi
diff --git a/revision b/revision
index 205a12b5..0f11735f 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-194
+196