summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-09-12 12:13:39 +0800
committerYuenan Li <liyuenan@huawei.com>2016-09-18 09:26:02 +0000
commite9c6204c777d4d5169d6678a868782a7835d1350 (patch)
treefb7ad04d58d7da5c4693e05af5f5299743ed0a37 /deploy/conf
parent17092c09eea12270fe3c4878adc7f70ff7d98fbc (diff)
Add a expansion functionality
Through modify the virtual_cluster_expansion.yml, include host's name and mac, you can decide to how many compute nodes you need to add. And you also need to modify network.yml. Note that external subnet's ip_range should be changed as the first 6 IPs are already taken by the first deployment. Edit ``add.sh``, check the environment variable. Note that the OS version and OpenStack version should be same as the first deployment. Run ``add.sh``. JIRA:COMPASS-481 Change-Id: Id85f02518667e0ff80c2475e70856cd30cf1b9b7 Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/base.conf2
-rw-r--r--deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml15
-rw-r--r--deploy/conf/virtual.conf8
-rw-r--r--deploy/conf/vm_environment/virtual_cluster_expansion.yml7
4 files changed, 28 insertions, 4 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 24eb703d..d60e68b1 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -25,6 +25,8 @@ export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"}
export ENABLE_VPNAAS="false"
export ENABLE_FWAAS="false"
+export EXPANSION=${EXPANSION:-"false"}
+
function next_ip {
ip_addr=$1
ip_base="$(echo $ip_addr | cut -d. -f'1 2 3')"
diff --git a/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml
new file mode 100644
index 00000000..b160b32a
--- /dev/null
+++ b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml
@@ -0,0 +1,15 @@
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: Huawei@123
+
+hosts:
+ - name: host6
+ mac: 'E8:4D:D0:BA:60:45'
+ interfaces:
+ - eth1: '08:4D:D0:BA:60:44'
+ ipmiIp: 172.16.131.23
+ roles:
+ - compute
diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
index 0475ee9b..7f4fcf02 100644
--- a/deploy/conf/virtual.conf
+++ b/deploy/conf/virtual.conf
@@ -1,7 +1,7 @@
-export VIRT_NUMBER=5
-export VIRT_CPUS=4
-export VIRT_MEM=16384
-export VIRT_DISK=200G
+export VIRT_NUMBER=${VIRT_NUMBER:-5}
+export VIRT_CPUS=${VIRT_CPU:-4}
+export VIRT_MEM=${VIRT_MEM:-16384}
+export VIRT_DISK=${VIRT_DISK:-200G}
export SWITCH_IPS="1.1.1.1"
export SWITCH_CREDENTIAL="version=2c,community=public"
diff --git a/deploy/conf/vm_environment/virtual_cluster_expansion.yml b/deploy/conf/vm_environment/virtual_cluster_expansion.yml
new file mode 100644
index 00000000..3d3298d3
--- /dev/null
+++ b/deploy/conf/vm_environment/virtual_cluster_expansion.yml
@@ -0,0 +1,7 @@
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+ - name: host6
+ roles:
+ - compute