summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-12 18:36:09 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-16 17:35:16 +0000
commit9d6feaec7430f0bc21e822ed3d0988d67dc40bf1 (patch)
tree0bf7febbbdf7a390a5ad6f4bcd12ae35f1ea3b9c
parent89eca50630100f2bd07acc4b659d776da1fe4417 (diff)
downloaddefinitions-9d6feaec7430f0bc21e822ed3d0988d67dc40bf1.tar.gz
Clean cluster!!
-rw-r--r--clusters/openstack-cluster.morph27
1 files changed, 3 insertions, 24 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index d176c965..582cb0a4 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -16,43 +16,22 @@ systems:
RABBITMQ_USER: rabbitmq
RABBITMQ_PASSWORD: veryinsecure
KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
- KEYSTONE_TEMPORARY_ADMIN_PASSWORD: veryinsecure
- KEYSTONE_PUBLIC_URL: http://onenode:5000/v2.0
- KEYSTONE_INTERNAL_URL: http://onenode:5000/v2.0
- KEYSTONE_ADMIN_URL: http://onenode:35357/v2.0
+ KEYSTONE_ADMIN_PASSWORD: veryinsecure
KEYSTONE_DB_USER: keystoneDB
KEYSTONE_DB_PASSWORD: veryinsecure
- IDENTITY_URI: http://onenode:35357
- CONTROLLER_HOST: onenode
- OPENSTACK_AUTH_HOST: onenode
- OPENSTACK_AUTH_PORT: 35357
+ CONTROLLER_HOST_ADDRESS: onenode
+ MANAGEMENT_INTERFACE_IP_ADDRESS: 10.24.1.198
GLANCE_SERVICE_USER: glance
GLANCE_SERVICE_PASSWORD: veryinsecure
- GLANCE_PUBLIC_URL: http://onenode:9292
- GLANCE_INTERNAL_URL: http://onenode:9292
- GLANCE_ADMIN_URL: http://onenode:9292
- GLANCE_HOST: onenode
GLANCE_DB_USER: glanceDB
GLANCE_DB_PASSWORD: veryinsecure
- NOVA_HOST: 127.0.0.1
NOVA_SERVICE_USER: nova
NOVA_SERVICE_PASSWORD: veryinsecure
- NOVA_PUBLIC_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\"
- NOVA_INTERNAL_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\"
- NOVA_ADMIN_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\"
- NOVA_NOVNCPROXY_BASE_URL: http:\/\/##NOVNC_HOST##:6080\/vnc_auto.html
- NOVA_REGION: regionOne
NOVA_DB_USER: novaDB
NOVA_DB_PASSWORD: veryinsecure
CINDER_USER: cinder
CINDER_PASSWORD: veryinsecure
- CINDER_PUBLIC_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\"
- CINDER_INTERNAL_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\"
- CINDER_ADMIN_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\"
CINDER_USER_V2: cinderv2
- CINDER_PUBLIC_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\"
- CINDER_INTERNAL_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\"
- CINDER_ADMIN_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\"
CINDER_DB_USER: cinderDB
CINDER_DB_PASSWORD: veryinsecure
CINDER_DEVICE: /dev/sdb