From 1a8ca07ea5b64d6c5ddb044a8d44de4304087e27 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 28 Apr 2015 14:52:01 +0000 Subject: 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 --- clusters/openstack-three-node-installer.morph | 8 -------- clusters/openstack-two-node-installer.morph | 7 ------- 2 files changed, 15 deletions(-) (limited to 'clusters') 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 -- cgit v1.2.1