diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-12-13 17:04:21 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-01-22 16:39:39 +0800 |
| commit | f229198474dd5c8af9a195679c0480e154629c9b (patch) | |
| tree | 4ba11b91a47d23eefeb360808cf6baafa5e55183 /deploy/launch.sh | |
| parent | 24e25de8fc981e3b33ffaa71e76f27dedcf6b89e (diff) | |
Fix some hard coding for some ip assignments
JIRA: COMPASS-570
1. fix hard coding in ip assignments for
install network. support full ip assignments
from network.yml
2. remove some used config item in deploy/conf
Change-Id: I566b74f4a55e6b96af3ee9f41d1e183a73424a91
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/launch.sh')
| -rwxr-xr-x | deploy/launch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index 98d9e4d6..2b32c337 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -15,6 +15,7 @@ mkdir -p $WORK_DIR/script export DEPLOY_FIRST_TIME=${DEPLOY_FIRST_TIME:-"true"} export DEPLOY_RECOVERY=${DEPLOY_RECOVERY:-"false"} +source ${COMPASS_DIR}/deploy/conf/base.conf source ${COMPASS_DIR}/deploy/prepare.sh prepare_python_env source ${COMPASS_DIR}/util/log.sh @@ -24,7 +25,6 @@ check_input_para source $(process_default_para $*) || exit 1 source ${COMPASS_DIR}/deploy/conf/${FLAVOR}.conf source ${COMPASS_DIR}/deploy/conf/${TYPE}.conf -source ${COMPASS_DIR}/deploy/conf/base.conf source ${COMPASS_DIR}/deploy/conf/compass.conf source ${COMPASS_DIR}/deploy/network.sh source ${COMPASS_DIR}/deploy/host_${TYPE}.sh |