More FlatDHCP

hooks/nova-compute-common

@@ -107,11 +107,13 @@ function configure_network_manager {
     "FlatDHCPManager")
       FLAT_INTERFACE=$(config-get flat-interface)
       EC2_HOST=$(relation-get ec2_host)
-      set_or_update network_manager nova.network.manager.FlatDCHPManager
+      [[ -z $EC2_HOST ]] && ensemble-log "nova-compute: Missing EC2_HOST" \
+        && exit 0
+      set_or_update network_manager nova.network.manager.FlatDHCPManager
       # the interface on which bridge is built
       set_or_update flat_interface $FLAT_INTERFACE
       # address of API server to forward requests
-      set_or_update ec2_host $EC2_HOST
+      set_or_update ec2_dmz_host $EC2_HOST
       ;;
     *) echo "ERROR: Invalid network manager $1" && exit 1 ;;
   esac

hooks/nova-compute-relations

@@ -72,6 +72,7 @@ function nova-network_changed {
     exit 0
   fi
   configure_network_manager $MANAGER
+  nova_ctl all restart
 }
 
 function image-service_changed {

metadata.yaml

@@ -1,6 +1,6 @@
 ensemble: formula
 name: nova-compute
-revision: 29
+revision: 34
 summary: "OpenStack compute"
 description: |
  OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In