summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-06-08 06:32:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-08 06:32:12 +0000
commite0d6c8a4e5c84bedbcbe91ca51c8bbabf1d8fdf8 (patch)
tree0fdc10b2e28df190a470feb4627e3ca1303d4890
parent420e2a340d66c481353683210f02ba06ba056433 (diff)
parent539a587a9096e522a10f51740c8c9422c03f56d9 (diff)
Merge "Set compute to qemu only in virtual deployment"
-rwxr-xr-xci/deploy/deploy.sh2
-rw-r--r--deploy/prepare.sh10
-rw-r--r--deploy/prepare/execute.py11
3 files changed, 17 insertions, 6 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index e99f62e0..596e4aa8 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -301,7 +301,7 @@ touch $WORKSPACE/known_hosts
scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/
echo "====== add relate config of kolla ======"
-ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK"
+ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK -b $IS_BARE"
echo "====== prepare cluster and pxe ======"
ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --cluster 'yes'"
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index d68a6a44..803d2462 100644
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -21,7 +21,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
usage: `basename $0` -n network_config_file
OPTIONS:
- -nw network configuration path, necessary
+ -n network configuration path, necessary
+ -b 0 for virtual, 1 for baremetal
-h Print this message and exit
Description:
@@ -35,12 +36,15 @@ EOF
NETWORK_CONF=''
-while getopts "n:h" OPTION
+while getopts "n:b:h" OPTION
do
case $OPTION in
n)
NETWORK_CONF=${OPTARG}
;;
+ b)
+ IS_BARE=${OPTARG}
+ ;;
h)
usage
exit 0
@@ -53,4 +57,4 @@ do
esac
done
-python $PYTHONPATH/deploy/prepare/execute.py -nw $NETWORK_CONF
+python $PYTHONPATH/deploy/prepare/execute.py -nw $NETWORK_CONF -b $IS_BARE
diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py
index 67c31b1b..2b46119d 100644
--- a/deploy/prepare/execute.py
+++ b/deploy/prepare/execute.py
@@ -39,7 +39,7 @@ def _config_service(service, subs):
@_config_service('nova', ['compute'])
-def _set_default_compute():
+def _set_qemu_compute():
return '[libvirt]\n' \
'virt_type=qemu\n' \
'cpu_mode=none\n'
@@ -65,8 +65,15 @@ def main():
type=str,
required=True,
help='network configuration file')
+ parser.add_argument('-b', '--is-baremetal',
+ type=str,
+ required=True,
+ help='0 for virtual, 1 for baremetal')
args = parser.parse_args()
- _set_default_compute()
+
+ if args.is_baremetal == '0':
+ _set_qemu_compute()
+
_set_default_floating_pool(args.network_file)
_set_trusts_auth()