summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2017-03-15 14:31:36 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2017-03-15 15:55:09 +0800
commite62117170f9dd562cdb85bf6bd95644655e046c2 (patch)
tree05a4e983534f1687f6d7b96b805eae7130bd08ed /ci
parentc557362eb2a14055587feac228a4463bd96f6f4a (diff)
add default_floating_pool configuration for nova-api
Change-Id: I9db5509667e9c10a9c07b55531c6d78fb95cc223 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'ci')
-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 efae8387..edbc67cf 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==="