X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fopenstack-stack-create.sh;h=d4ce7879420669059695d2b66e5a38551aaf96e1;hb=refs%2Ftags%2Fv0.89.5;hp=0a2dc9ff1806726a6b6a6a6a4208da8a164ae622;hpb=a8c7722c19cfca9f0361c578ce63bf552093dd0e;p=releng%2Fglobal-jjb.git diff --git a/shell/openstack-stack-create.sh b/shell/openstack-stack-create.sh index 0a2dc9ff..d4ce7879 100644 --- a/shell/openstack-stack-create.sh +++ b/shell/openstack-stack-create.sh @@ -21,26 +21,14 @@ set -eux -o pipefail # shellcheck disable=SC1090 source ~/lf-env.sh -# Check if openstack venv was previously created -if [ -f "/tmp/.os_lf_venv" ]; then - os_lf_venv=$(cat "/tmp/.os_lf_venv") -fi +lf-activate-venv --python python3 "lftools[openstack]" \ + kubernetes \ + niet \ + python-heatclient \ + python-openstackclient \ + python-magnumclient \ + yq -if [ -d "${os_lf_venv}" ] && [ -f "${os_lf_venv}/bin/openstack" ]; then - echo "Re-use existing venv: ${os_lf_venv}" - PATH=$os_lf_venv/bin:$PATH -else - lf-activate-venv --python python3 "cryptography<3.4" \ - "lftools[openstack]" \ - kubernetes \ - "niet~=1.4.2" \ - python-heatclient \ - python-openstackclient \ - python-magnumclient \ - setuptools \ - "openstacksdk<0.99" \ - yq -fi openstack --os-cloud "$os_cloud" limits show --absolute pushd "$stack_template_dir" || exit 1