diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-04-28 14:52:01 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-05-07 10:07:23 +0000 |
commit | 03e2214f4b95cb5a60859a728ab7868ce3d25b90 (patch) | |
tree | cfab16989e2bd805408920951138a56e49a78bf0 | |
parent | 438c2864d0c798d228c5d8ffa550cdd57190429b (diff) | |
download | definitions-03e2214f4b95cb5a60859a728ab7868ce3d25b90.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.morph | 8 | ||||
-rw-r--r-- | clusters/openstack-two-node-installer.morph | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph index a368b349..150506d0 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 961f22b1..dd0bfd58 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 |