summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-10-28 10:02:25 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:20 +0000
commit38c40f89d44b1b51511374165c83eabd46c5c867 (patch)
tree0b112d5cca9fe85521d1070779b3db9973c61297 /clusters
parenta99736e27a90e3cb8231f8a0cb5611e253fd2449 (diff)
downloaddefinitions-38c40f89d44b1b51511374165c83eabd46c5c867.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.
Diffstat (limited to 'clusters')
-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