summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-10-28 10:02:25 +0000
committerRichard Ipsum <richardipsum@fastmail.co.uk>2014-11-27 18:11:31 +0000
commita7f7c527588142641b9bde44d01080237c1ae06f (patch)
tree70ff3dc3c62bdd26b763f3b9bb42413eeb4de73d
parente38ef98a18d18db781cf4dbb84609f8d1b2fe12b (diff)
downloaddefinitions-a7f7c527588142641b9bde44d01080237c1ae06f.tar.gz
Fix nova cluster configuration
Add NOVA_REGION obligatory field and add quotes to the command needed when are replaced for the token. This is needed because the use of %(...) structure in the command wouldn't be nicely expanded causing the command to fail.
-rw-r--r--clusters/openstack-cluster.morph9
1 files changed, 5 insertions, 4 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index a4dc4c2a..e851aa73 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -25,8 +25,9 @@ systems:
OPENSTACK_AUTH_HOST: localhost
NOVA_HOST: localhost
GLANCE_HOST: localhost
- NOVA_SERVICE_USER: glance
+ NOVA_SERVICE_USER: nova
NOVA_SERVICE_PASSWORD: veryinsecure
- NOVA_PUBLIC_URL: http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s
- NOVA_INTERNAL_URL:http: \/\/localhost:8774\/v2\/\%\(tenant_id\)s
- NOVA_ADMIN_URL: http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s
+ NOVA_PUBLIC_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\"
+ NOVA_INTERNAL_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\"
+ NOVA_ADMIN_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\"
+ NOVA_REGION: LON