From 8a6f39e4a8fd11c2d458e5d8c2d86bdf56927471 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 7 Dec 2017 11:39:36 +0000 Subject: [PATCH] xci: Make it easier to use OpenStack-Ansible stable branches It seems it is desirable for projects to use stable OpenStak-Ansible and OpenStack releases in general. However, merely overriding OPENSTACK_OSA_VERSION doesn't work because role requirements and OpenStack services have to be adapted too. Despite the Documentation warning users about this, seems like nobody remembers to read and do the necessary steps. However, this leads to numerous invalid bug reports due to this stable/master mix. Lets try to help improving this situation by doing all the necessary ground work if we detect that we are using a stable branch. Change-Id: I2ba5d7e7942109973b6a6523aae2c01b65e61fe7 Signed-off-by: Markos Chandras --- xci/scripts/update-osa-version-files.sh | 2 +- xci/xci-deploy.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index edd09da4..52e21ca5 100755 --- a/xci/scripts/update-osa-version-files.sh +++ b/xci/scripts/update-osa-version-files.sh @@ -53,7 +53,7 @@ popd &> /dev/null pushd $tempdir/openstack-ansible &> /dev/null source scripts/sources-branch-updater-lib.sh printme "Synchronize roles and packages" -update_ansible_role_requirements "master" "true" "true" +update_ansible_role_requirements "${OPENSTACK_OSA_VERSION:-master}" "true" "true" # Construct the ansible-role-requirements-file echo """--- diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index d5e41f66..4722546d 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -126,6 +126,20 @@ if [[ $OS_FAMILY == RedHat ]]; then exit 1 fi +if [[ ${OPENSTACK_OSA_VERSION} =~ "stable/" ]]; then + echo "" + echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + echo "WARNING: We have detected that you are trying to use a stable OpenStack-Ansible." + echo "This will likely not work because, unless you know what you are doing, you are going" + echo "to be mixing roles and services from the master branch with a stable OpenStack-Ansible." + echo "This is _NOT_ supported in any way but we can try to make it work for you." + echo "Either way you are on your own so please do not report bugs as they will be considered invalid." + echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + echo "" + sleep 15 + trap - ERR + ${XCI_PATH}/xci/scripts/update-osa-version-files.sh ${OPENSTACK_OSA_VERSION} +fi # TODO: The xci playbooks can be put into a playbook which will be done later. # Clone OPNFV scenario repositories -- 2.16.6