summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-23 09:27:26 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-27 16:32:28 (GMT)
commit0ba3f2bcec55427776b9209e6134ee1daab45785 (patch)
treee40519b803ca66ea2a73c7ffb6aa6f0553d15e7f
parentcfc0db83c06b525ac8686e00986d1057a9131c08 (diff)
downloaddefinitions-baserock/pedroalvarez/openstack-ansible-v6-for-patches.tar.gz
Modify conf exts in system and rewrite clusterbaserock/pedroalvarez/openstack-ansible-v6-for-patches
-rw-r--r--clusters/openstack-cluster.morph38
-rw-r--r--systems/openstack-server.morph2
2 files changed, 8 insertions, 32 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph
index 3e22074..3e3bda1 100644
--- a/clusters/openstack-cluster.morph
+++ b/clusters/openstack-cluster.morph
@@ -4,10 +4,8 @@ systems:
- morph: systems/openstack-server.morph
deploy:
release:
- type: rawdisk
- location: baserock-xx-openstack-system-x86_64.img
- # type: kvm
- # location: kvm+ssh://franred@refinery.ducie.codethink.co.uk/franred-openstack-test/home/franred/openstack.img
+ type: kvm
+ location: kvm+ssh://pedroalvarez@arcology.ducie.codethink.co.uk/pedroalvarez-os/home/pedroalvarez/openstack.img
DISK_SIZE: 5G
RAM_SIZE: 1G
VCPUS: 1
@@ -18,49 +16,27 @@ 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
- 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
+ NOVA_VIRT_TYPE: qemu
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
NEUTRON_SERVICE_USER: neutron
NEUTRON_SERVICE_PASSWORD: veryinsecure
NEUTRON_DB_USER: neutronDB
NEUTRON_DB_PASSWORD: veryinsecure
- NEUTRON_PUBLIC_URL: http:\/\/onenode:9696
- NEUTRON_INTERNAL_URL: http:\/\/onenode:9696
- NEUTRON_ADMIN_URL: http:\/\/onenode:9696
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph
index c1d345e..e493e72 100644
--- a/systems/openstack-server.morph
+++ b/systems/openstack-server.morph
@@ -65,7 +65,7 @@ configuration-extensions:
- openstack-keystone
- openstack-glance
- openstack-nova
-- openstack-rabbitmq
- openstack-cinder
- openstack-neutron
- openvswitch
+- hosts