summaryrefslogtreecommitdiffstats
path: root/ci/deploy
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-03-15 14:28:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-15 14:28:04 +0000
commit3be546d10b71cec1d8a4d2a2e3d513284bbc6569 (patch)
treeb2133ed060e32ea4163b006a229c93ddb6c83586 /ci/deploy
parentaf66c7f4fd99ca8491fa3024832cdad0568b3047 (diff)
parente62117170f9dd562cdb85bf6bd95644655e046c2 (diff)
Merge "add default_floating_pool configuration for nova-api"
Diffstat (limited to 'ci/deploy')
-rwxr-xr-xci/deploy/deploy.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 3caacde4..0317d0ba 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -301,6 +301,8 @@ if [ $IS_BARE == 0 ];then
echo "====== add relate config of kolla==========="
ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova"
ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf"
+ NETWORK_CONF="$REMOTE_SPACE/deploy/config/vm_environment/$LAB_NAME-$POD_NAME/network.yml"
+ ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK_CONF"
fi
echo "===prepare cluster and pxe==="