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>

diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh
index bd9493e..d85695d 100755 (executable)
--- a/bifrost/scripts/bifrost-provision.sh
+++ b/bifrost/scripts/bifrost-provision.sh
@@ -16,7 +16,7 @@ BIFROST_HOME=$SCRIPT_HOME/..
 ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack}
 ENABLE_VENV="false"
 USE_DHCP="false"
-USE_VENV="false"
+USE_VENV="true"
 BUILD_IMAGE=true
 PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
 

diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index 4c76091..1e39213 100755 (executable)
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -26,6 +26,6 @@
 # use releng-xci from master until the development work with the sandbox is complete
 export OPNFV_RELENG_VERSION="master"
 # HEAD of bifrost "master" as of 29.06.2017
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"7c9bb5e07c6bc3b42c9a9e8457e5eef511075b38"}
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"db9f2f556bf92558275c0422beafb5e68eff59f1"}
 # HEAD of osa "master" as of 05.09.2017
 export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"d32bb257cbad2410711d6cdf54faff828605026e"}

diff --git a/xci/file/install-ansible.sh b/xci/file/install-ansible.sh
index ca7763a..bc7bd1e 100644 (file)
--- a/xci/file/install-ansible.sh
+++ b/xci/file/install-ansible.sh
@@ -44,6 +44,7 @@ case ${ID,,} in
 
     ubuntu|debian)
     OS_FAMILY="Debian"
+    export DEBIAN_FRONTEND=noninteractive
     INSTALLER_CMD="sudo -H -E apt-get -y install"
     CHECK_CMD="dpkg -l"
     PKG_MAP=( [gcc]=gcc

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index c798135..d73cf5c 100755 (executable)
--- 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 "-----------------------------------------------------------------------"