diff options
| -rw-r--r-- | xci/file/ansible-role-requirements.yml | 2 | ||||
| -rwxr-xr-x | xci/nfvi/osa/nfvi-deploy.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xci/file/ansible-role-requirements.yml b/xci/file/ansible-role-requirements.yml index 8f166a07..90e40d5f 100644 --- a/xci/file/ansible-role-requirements.yml +++ b/xci/file/ansible-role-requirements.yml @@ -96,7 +96,7 @@ - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: 8fcd29197797eef409254605f0ce73ef8d1bda6b + version: 0b3eb9348d55d6b1cf077a2c45b297f9a1be730d - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/nfvi/osa/nfvi-deploy.sh index f1d1af32..94e331fa 100755 --- a/xci/nfvi/osa/nfvi-deploy.sh +++ b/xci/nfvi/osa/nfvi-deploy.sh @@ -8,12 +8,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -if [[ ${OPENSTACK_OSA_VERSION} =~ "stable/" ]]; then +if [[ ${OPENSTACK_OSA_VERSION} =~ (stable/|master) ]]; then echo "" echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" - echo "WARNING: We have detected that you are trying to use a stable OpenStack-Ansible." + echo "WARNING: We have detected that you are trying to OpenStack-Ansible from stable or master branch." 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 "to be trying something that has not been verified by XCI or upstream fully." 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 "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" |