diff options
| author |   Justin chi <chigang@huawei.com> | 2016-09-28 02:13:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-28 02:13:21 +0000 |
| commit | 066871de64c28d3e6adb4fe5a17bd9c894074f75 (patch) | |
| tree | 067a6cee5c642e55112e5739bf3f3c55e9419168 /deploy/conf | |
| parent | f5d302d1f71637df5fdd3fc815c1d7a760b6e9d4 (diff) | |
| parent | e9c6204c777d4d5169d6678a868782a7835d1350 (diff) | |
Merge "Add a expansion functionality"
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/base.conf | 2 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml | 15 | ||||
| -rw-r--r-- | deploy/conf/virtual.conf | 8 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/virtual_cluster_expansion.yml | 7 |
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 |