summaryrefslogtreecommitdiffstats
path: root/xci/xci-deploy.sh
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-10-03 08:35:47 +0100
committerMarkos Chandras <mchandras@suse.de>2017-10-06 07:41:01 +0000
commit2de7f32d98f60253080317901d28c842b81a0544 (patch)
tree804767432567502f98630e5e96fcded266b8bbf6 /xci/xci-deploy.sh
parentdfd9229ad20d0ff724ce5ccf45161c8eb5e2c9e5 (diff)
xci: Bump bifrost SHA
The latest bifrost code contains a fix when setting up DNS from a glean configuration drive and also a few virtualenv improvements. This allows us to get rid of all the workarounds we had in the past to switch Ansible versions in the middle of the XCI deployment. Change-Id: If49e290315ec96efdc07d04ff6624439c53aee19 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-xxci/xci-deploy.sh13
1 files changed, 0 insertions, 13 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index c798135f..d73cf5cd 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -145,10 +145,6 @@ sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers
cd $XCI_PATH/../bifrost/
sudo -E bash ./scripts/destroy-env.sh
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 ${XCI_ANSIBLE_VERBOSITY} -i inventory provision-vm-nodes.yml
cd ${OPENSTACK_BIFROST_PATH}
bash ./scripts/bifrost-provision.sh
@@ -169,15 +165,6 @@ echo
echo "Info: Configuring localhost for openstack-ansible"
echo "-----------------------------------------------------------------------"
-# NOTE(hwoarang) we need newer ansible to work on the OSA playbooks. Make sure
-# all installations are gone. This is ugly and has to be removed as soon as we
-# are able to deploy bifrost in vent or when bifrost start working with newest
-# ansible
-pip uninstall -y ansible || true
-sudo -H pip uninstall -y ansible || true
-sudo pip install --force-reinstall ansible==${XCI_ANSIBLE_PIP_VERSION}
-# Start fresh
-hash -r
cd $XCI_PATH/playbooks
ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory configure-localhost.yml
echo "-----------------------------------------------------------------------"