X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fopenstack-kubernetes-create.sh;h=b4054c33fa64b9cc0e18344074c4d16499e4dd4f;hb=5f3d9b0c8343ee4dce1ed0d0c39f8677799b0c74;hp=5aef45d1f3c6d02db9c181e8829597049a1c4d3a;hpb=a8c7722c19cfca9f0361c578ce63bf552093dd0e;p=releng%2Fglobal-jjb.git diff --git a/shell/openstack-kubernetes-create.sh b/shell/openstack-kubernetes-create.sh index 5aef45d1..b4054c33 100755 --- a/shell/openstack-kubernetes-create.sh +++ b/shell/openstack-kubernetes-create.sh @@ -16,26 +16,13 @@ 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 - -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 +lf-activate-venv --python python3 "lftools[openstack]" \ + kubernetes \ + niet \ + python-heatclient \ + python-openstackclient \ + python-magnumclient \ + yq os_cloud="${OS_CLOUD:-vex}" fixed_network="${FIXED_NETWORK}"