diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-10-10 10:09:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-10 10:09:25 +0000 |
| commit | e5a91700c558380f664a7e0739828d18db7716e5 (patch) | |
| tree | 1248e0852c276748639cb8440d83e6bcf7cbc3e5 /xci | |
| parent | fdd43517bdedbab52fcaa523f4cafe0aeac91d84 (diff) | |
| parent | 2de7f32d98f60253080317901d28c842b81a0544 (diff) | |
Merge "xci: Bump bifrost SHA"
Diffstat (limited to 'xci')
| -rwxr-xr-x | xci/config/pinned-versions | 2 | ||||
| -rw-r--r-- | xci/file/install-ansible.sh | 1 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 13 |
3 files changed, 2 insertions, 14 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 4c760918..1e392132 100755 --- 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 ca7763ad..bc7bd1e4 100644 --- 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 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 "-----------------------------------------------------------------------" |