diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-23 09:27:26 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-08 18:29:31 +0100 |
commit | 7f5894490a60180878827295d706e8e13a59c458 (patch) | |
tree | 8f857899c9491eb2b4ae111b5a2d9261fb449380 | |
parent | f3e196ec3de0b14a29f44a366cec3812e68a9838 (diff) | |
download | definitions-7f5894490a60180878827295d706e8e13a59c458.tar.gz |
Modify conf exts in system and rewrite cluster
-rw-r--r-- | clusters/openstack-cluster.morph | 32 | ||||
-rw-r--r-- | systems/openstack-server.morph | 2 |
2 files changed, 6 insertions, 28 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph index 3e220741..23330cc6 100644 --- a/clusters/openstack-cluster.morph +++ b/clusters/openstack-cluster.morph @@ -18,49 +18,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 c1d345e7..e493e725 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 |