diff options
author | Markos Chandras <mchandras@suse.de> | 2017-09-22 14:06:10 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 14:06:10 +0000 |
commit | 08fbdfaadb1cfba8ba46d1970d784bfbabc7e212 (patch) | |
tree | c77fbff6cb8ff484cdce2e22b8012bac6727e458 /xci/xci-deploy.sh | |
parent | 639ac5a794f961fb2a8db3cb3fb19681de26ab3c (diff) | |
parent | 3a281e5c91bf05d94361af1ff5818657d92a1bfd (diff) |
Merge changes from topic 'split-variable-creation-to-task'
* changes:
xci: playbooks: Include distribution var files dynamically
bifrost: scripts: Look for virtualbmc on bifrost virtualenv
xci: Gain elevated privileges to remove the XCI_DEVEL_ROOT directory
xci: Move VM provisioning to xci-deploy.sh
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-x | xci/xci-deploy.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 6a661349..19f2c18a 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -115,7 +115,13 @@ fi echo "Info: Starting provisining VM nodes using openstack/bifrost" echo "-------------------------------------------------------------------------" cd $XCI_PATH/playbooks +# NOTE(hwoarang) we need newer ansible to work on the following playbook +sudo pip uninstall -y ansible || true +sudo -H pip uninstall -y ansible || true +sudo pip install ansible==${XCI_ANSIBLE_PIP_VERSION} ansible-playbook -i inventory provision-vm-nodes.yml +cd ${OPENSTACK_BIFROST_PATH} +bash ./scripts/bifrost-provision.sh echo "-----------------------------------------------------------------------" echo "Info: VM nodes are provisioned!" source $OPENSTACK_BIFROST_PATH/env-vars @@ -130,8 +136,11 @@ echo # - creates log directory # - copies flavor files such as playbook, inventory, and var file #------------------------------------------------------------------------------- + echo "Info: Configuring localhost for openstack-ansible" echo "-----------------------------------------------------------------------" +# NOTE(hwoarang) we need newer ansible to work on the OSA playbooks +sudo pip install --force-reinstall ansible==${XCI_ANSIBLE_PIP_VERSION} cd $XCI_PATH/playbooks ansible-playbook -i inventory configure-localhost.yml echo "-----------------------------------------------------------------------" |