diff --git a/Dockerfile b/Dockerfile index b7bb2d4..502c043 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG PIP_ARGS="" ARG PIP_WHEEL_ARGS=$PIP_ARGS ARG DIST_PACKAGES="" ARG PLUGIN=no -ARG PYTHON3=no +ARG PYTHON3=indeed ARG EXTRA_BINDEP="" ARG EXTRA_PYDEP="" ARG REGISTRY_PROTOCOL="detect" diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml index 1889481..703dd6b 100644 --- a/playbooks/vars.yaml +++ b/playbooks/vars.yaml @@ -32,7 +32,6 @@ distros: PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} WHEELS: 172.17.0.1:5000/loci/requirements:master-centos FROM: base:centos - PYTHON3: yes requirements: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements @@ -54,12 +53,10 @@ distros: PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_focal FROM: base:ubuntu_focal - PYTHON3: yes requirements: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements FROM: base:ubuntu_focal - PYTHON3: yes - name: ubuntu_bionic image: ubuntu:bionic release: ussuri @@ -76,12 +73,10 @@ distros: PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic FROM: base:ubuntu_bionic - PYTHON3: yes requirements: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements FROM: base:ubuntu_bionic - PYTHON3: yes - name: leap15 release: master buildargs: @@ -99,7 +94,6 @@ distros: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements FROM: base:leap15 - PYTHON3: yes - name: debian image: debian:stretch release: train @@ -119,11 +113,9 @@ distros: PROJECT_RELEASE: "train" WHEELS: 172.17.0.1:5000/loci/requirements:train-debian FROM: base:debian - PYTHON3: yes requirements: PROJECT: requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REF: "stable/train" PROJECT_RELEASE: "train" FROM: base:debian - PYTHON3: yes