From b6b4cff68bf09cd611ab8d4fea494fde78eaaa48 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 4 Dec 2012 21:58:13 +0000 Subject: [PATCH] Ensure that keystone_host is provided before trying to configure quantum --- hooks/nova-compute-common | 3 +++ revision | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hooks/nova-compute-common b/hooks/nova-compute-common index fdb804e..6fc3304 100755 --- a/hooks/nova-compute-common +++ b/hooks/nova-compute-common @@ -109,6 +109,9 @@ function configure_network_manager { set_or_update ec2_dmz_host $ec2_host ;; "Quantum") + local keystone_host=$(relation-get keystone_host) + [[ -z $keystone_host ]] && juju-log "nova-compute: Missing keystone host" \ + && exit 0 set_or_update "network_api_class" "nova.network.quantumv2.api.API" set_or_update "quantum_auth_strategy" "keystone" set_or_update "quantum_url" "http://$(relation-get quantum_host):9696" diff --git a/revision b/revision index dd47563..987e7ca 100644 --- a/revision +++ b/revision @@ -1 +1 @@ -76 +77