Change-Id: I6137f9dbeed1b15c3e6fc7d63bb1892cf2b9471e
Signed-off-by: meimei <meimei@huawei.com>
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- 'liberty'
- choice:
name: COMPASS_OS_VERSION_OPTION
- 'liberty'
- choice:
name: COMPASS_OS_VERSION_OPTION
export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
-if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" || "${OPENSTACK_VERSION}" = "newton" ]]; then
+if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
+if [[ "${OPENSTACK_VERSION}" = "newton" ]]; then
+ export OS_VERSION="xenial"
+ export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION}
+fi
+
if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
export NETWORK_CONF_FILE=network_ocl.yml
if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
export NETWORK_CONF_FILE=network_ocl.yml
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- 'liberty'
- choice:
name: COMPASS_OS_VERSION
- 'liberty'
- choice:
name: COMPASS_OS_VERSION
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- 'liberty'
- choice:
name: COMPASS_OS_VERSION
- 'liberty'
- choice:
name: COMPASS_OS_VERSION