summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhongjun <zhong.jun@zte.com.cn>2017-07-07 09:07:48 +0800
committerzhongjun <zhong.jun@zte.com.cn>2017-07-07 16:25:16 +0800
commit69a1af39f02bb5c6a471768648c15f8ae1e85776 (patch)
tree05a990bf71ccfb218e27d684bca865fefd25aeac
parentc255bbbc6ae14ebc4320bb023cb98a31787d8985 (diff)
Enable HA scenarios
Enable HA scenario options due to support HA function in upsteam. Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
-rwxr-xr-xci/deploy/deploy.sh4
-rw-r--r--deploy/utils.py5
2 files changed, 7 insertions, 2 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index d73a2c9d..2451c3f2 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -63,7 +63,9 @@ TARGET_HOSTS_NUM=0
DRY_RUN=0
IS_BARE=1
VM_MULTINODE=("computer01" "computer02" "controller02" "controller03" "controller01")
-VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl_l3-nofeature-noha" "os-odl_l2-nofeature-noha")
+VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl_l3-nofeature-noha"
+ "os-odl_l2-nofeature-noha" "os-odl_l3-nofeature-ha" "os-odl_l2-nofeature-ha")
+
#
# END of variables to customize
############################################################################
diff --git a/deploy/utils.py b/deploy/utils.py
index 102ae1f3..bb5535fc 100644
--- a/deploy/utils.py
+++ b/deploy/utils.py
@@ -21,7 +21,10 @@ WORKSPACE = os.path.normpath(path_join(os.path.dirname(__file__), '..'))
BASE = CWD
valid_scenario_list = ['os-nosdn-nofeature-noha',
'os-odl_l3-nofeature-noha',
- 'os-odl_l2-nofeature-noha']
+ 'os-odl_l2-nofeature-noha',
+ 'os-nosdn-nofeature-ha',
+ 'os-odl_l3-nofeature-ha',
+ 'os-odl_l2-nofeature-ha']
def get_logger():