Export hostname as ec2_host

hooks/nova-cloud-controller-common

@@ -111,7 +111,6 @@ function configure_network_manager {
       ;;
     "FlatDHCPManager")
       set_or_update network_manager nova.network.manager.FlatDHCPManager
-      relation-set ec2_host=$(hostname -f)
       ;;
     *) echo "ERROR: Invalid network manager $1" && exit 1 ;;
   esac

hooks/nova-cloud-controller-relations

@@ -87,7 +87,7 @@ function nova-network_joined {
   # take care of assigning non-conflicting IPs to compute nodes
   manager=$(cat $NOVA_CONF | grep network_manager | cut -d= -f2)
   manager=$(echo $manager | sed -e 's/\./ /g' | awk '{ print $4 }')
-  relation-set network_manager=$manager
+  relation-set network_manager=$manager ec2_host=$(hostname -f)
 }
 
 case $ARG0 in

metadata.yaml

@@ -1,6 +1,6 @@
 ensemble: formula
 name: nova-cloud-controller
-revision: 51
+revision: 52
 summary: "Openstack nova controller node."
 description: |
   Cloud controller node for Openstack nova.  Contains nova-schedule,