summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-11-26 17:34:14 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:25 +0000
commit584d66db1810eb640b9afd6e3f952fffdde88aa7 (patch)
treed5386a4aa37bc5f81332fdd67f046292e834b446 /clusters
parent2d72c26366ca77d7a1a49e928a14c43b11706a81 (diff)
downloaddefinitions-584d66db1810eb640b9afd6e3f952fffdde88aa7.tar.gz
Add cinder services
This commit add: - Cinder services - Cinder setup script and service - Cinder integration script (config file) - Cinder files in the manifest - Cinder string on the cluster - Move nova region to regionOne (default value) rather than LON
Diffstat (limited to 'clusters')
-rw-r--r--clusters/openstack-cluster.morph11
1 files changed, 10 insertions, 1 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index 0d8a13b0..935aaa84 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -34,4 +34,13 @@ systems:
NOVA_INTERNAL_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\"
NOVA_ADMIN_URL: \"http:\/\/localhost:8774\/v2\/\%\(tenant_id\)s\"
NOVA_NOVNCPROXY_BASE_URL: http:\/\/localhost:6080\/vnc_auto.html
- NOVA_REGION: LON
+ NOVA_REGION: regionOne
+ CINDER_USER: cinder
+ CINDER_PASSWORD: veryinsecure
+ CINDER_PUBLIC_URL: \"http:\/\/localhost:8776\/v1\/\%\(tenant_id\)s\"
+ CINDER_INTERNAL_URL: \"http:\/\/localhost:8776\/v1\/\%\(tenant_id\)s\"
+ CINDER_ADMIN_URL: \"http:\/\/localhost:8776\/v1\/\%\(tenant_id\)s\"
+ CINDER_USER_V2: cinderv2
+ CINDER_PUBLIC_URL_V2: \"http:\/\/localhost:8776\/v2\/\%\(tenant_id\)s\"
+ CINDER_INTERNAL_URL_V2: \"http:\/\/localhost:8776\/v2\/\%\(tenant_id\)s\"
+ CINDER_ADMIN_URL_V2: \"http:\/\/localhost:8776\/v2\/\%\(tenant_id\)s\"