summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-28 14:52:01 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-05-01 12:17:40 (GMT)
commit1a8ca07ea5b64d6c5ddb044a8d44de4304087e27 (patch)
tree1f51419002b0df3559af16223b6230dde5551316
parent3678828f375d309463c4d756a11957a028296d47 (diff)
downloaddefinitions-1a8ca07ea5b64d6c5ddb044a8d44de4304087e27.tar.gz
openstack: remove duplicated information in cluster
Those variables were already defined somewhere in the cluster, so there is no need to duplicate them. Change-Id: Ia02e93b561f9d33580c45d96d7f01520acf3b678
-rw-r--r--clusters/openstack-three-node-installer.morph8
-rw-r--r--clusters/openstack-two-node-installer.morph7
2 files changed, 0 insertions, 15 deletions
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index a368b34..150506d 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -209,23 +209,15 @@ systems:
<<: *stack-node
HOSTNAME: threenode-compute
- NOVA_VIRT_TYPE: kvm
-
CINDER_ENABLE_CONTROLLER: False
CINDER_ENABLE_COMPUTE: True
CINDER_ENABLE_STORAGE: True
- CINDER_SERVICE_USER: cinder
- CINDER_SERVICE_PASSWORD: veryinsecure
- CINDER_DB_USER: cinderDB
- CINDER_DB_PASSWORD: veryinsecure
- CINDER_DEVICE: /dev/sdb
NOVA_ENABLE_COMPUTE: True
NEUTRON_ENABLE_AGENT: True
NEUTRON_ENABLE_MANAGER: False
NEUTRON_ENABLE_CONTROLLER: False
- METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
CEILOMETER_ENABLE_CONTROLLER: False
CEILOMETER_ENABLE_COMPUTE: True
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index 961f22b..dd0bfd5 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -167,23 +167,16 @@ systems:
<<: *stack-node
HOSTNAME: twonode-compute
- NOVA_VIRT_TYPE: kvm
NOVA_ENABLE_COMPUTE: True
NOVA_ENABLE_CONTROLLER: False
CINDER_ENABLE_CONTROLLER: False
CINDER_ENABLE_COMPUTE: True
CINDER_ENABLE_STORAGE: True
- CINDER_SERVICE_USER: cinder
- CINDER_SERVICE_PASSWORD: veryinsecure
- CINDER_DB_USER: cinderDB
- CINDER_DB_PASSWORD: veryinsecure
- CINDER_DEVICE: /dev/sdb
NEUTRON_ENABLE_AGENT: True
NEUTRON_ENABLE_MANAGER: False
NEUTRON_ENABLE_CONTROLLER: False
- METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
IRONIC_ENABLE_SERVICE: False