Setting PYTHON3=no for LOCI images
Recently, LOCI changed its default so images are python3 if nothing is
specified at the *docker_image files. With the recent upversion of LOCI
in the build tools [1], we need to explictly set PYTHON3=no to images
that are still using python2. This commit fixes the StarlingX images to
use this parameter.
This will also remove all PYTHON3=yes since it's the detault now to
reduce uneeded LOCs and ease maintenance.
TEST PLAN
PASS build the stx-nova on the stable branch
PASS build the stx-openstackclients on the stable branch
PASS build the stx-platformclients on the stable branch
[1] 00bd632a68
Closes-Bug: #1958696
Depends-On: https://review.opendev.org/c/starlingx/root/+/826155
Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: Idffec6b57371326e8667ac4b16ac9b11f22afe1a
This commit is contained in:
parent
7175469644
commit
f1757b9f11
@ -8,5 +8,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -9,4 +9,3 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -9,5 +9,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -10,4 +10,3 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -8,5 +8,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -9,4 +9,3 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -4,5 +4,4 @@ PROJECT=barbican
|
|||||||
PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
||||||
PIP_PACKAGES="pycrypto"
|
PIP_PACKAGES="pycrypto"
|
||||||
PROFILES="fluent"
|
PROFILES="fluent"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
|||||||
PROJECT_REF=stable/ussuri
|
PROJECT_REF=stable/ussuri
|
||||||
PIP_PACKAGES="pycrypto"
|
PIP_PACKAGES="pycrypto"
|
||||||
PROFILES="fluent"
|
PROFILES="fluent"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -4,5 +4,4 @@ PROJECT=ceilometer
|
|||||||
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
||||||
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
||||||
DIST_PACKAGES="libvirt ipmitool"
|
DIST_PACKAGES="libvirt ipmitool"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
|||||||
PROJECT_REF=stable/ussuri
|
PROJECT_REF=stable/ussuri
|
||||||
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
||||||
DIST_PACKAGES="libvirt ipmitool"
|
DIST_PACKAGES="libvirt ipmitool"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -5,4 +5,3 @@ PROJECT_REPO=https://opendev.org/openstack/cinder.git
|
|||||||
DIST_PACKAGES="nfs-utils"
|
DIST_PACKAGES="nfs-utils"
|
||||||
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
||||||
PROFILES="fluent cinder lvm ceph qemu"
|
PROFILES="fluent cinder lvm ceph qemu"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -6,4 +6,3 @@ PROJECT_REF=stable/ussuri
|
|||||||
DIST_PACKAGES="nfs-utils"
|
DIST_PACKAGES="nfs-utils"
|
||||||
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
||||||
PROFILES="fluent cinder lvm ceph qemu"
|
PROFILES="fluent cinder lvm ceph qemu"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -5,5 +5,4 @@ PROJECT_REPO=https://opendev.org/openstack/glance.git
|
|||||||
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
||||||
DIST_PACKAGES="postgresql-libs"
|
DIST_PACKAGES="postgresql-libs"
|
||||||
PROFILES="fluent glance ceph"
|
PROFILES="fluent glance ceph"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -6,4 +6,3 @@ PROJECT_REF=stable/ussuri
|
|||||||
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
||||||
DIST_PACKAGES="postgresql-libs"
|
DIST_PACKAGES="postgresql-libs"
|
||||||
PROFILES="fluent glance ceph"
|
PROFILES="fluent glance ceph"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -9,5 +9,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -10,5 +10,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -4,5 +4,4 @@ PROJECT=heat
|
|||||||
PROJECT_REPO=https://opendev.org/openstack/heat.git
|
PROJECT_REPO=https://opendev.org/openstack/heat.git
|
||||||
PIP_PACKAGES="pycrypto pylint"
|
PIP_PACKAGES="pycrypto pylint"
|
||||||
PROFILES="fluent heat apache"
|
PROFILES="fluent heat apache"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ PROJECT_REPO=https://opendev.org/openstack/heat.git
|
|||||||
PROJECT_REF=stable/ussuri
|
PROJECT_REF=stable/ussuri
|
||||||
PIP_PACKAGES="pycrypto pylint"
|
PIP_PACKAGES="pycrypto pylint"
|
||||||
PROFILES="fluent heat apache"
|
PROFILES="fluent heat apache"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -14,5 +14,4 @@ CUSTOMIZATION="\
|
|||||||
sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/operations.py && \
|
sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/operations.py && \
|
||||||
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \
|
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -15,4 +15,3 @@ CUSTOMIZATION="\
|
|||||||
sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/operations.py && \
|
sed -i -e '/query.decode.errors=.replace../s/decode/encode/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/operations.py && \
|
||||||
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \
|
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -8,5 +8,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -9,4 +9,3 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -5,5 +5,4 @@ PROJECT_REPO=https://opendev.org/openstack/neutron.git
|
|||||||
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
||||||
DIST_PACKAGES="ethtool lshw"
|
DIST_PACKAGES="ethtool lshw"
|
||||||
PROFILES="fluent neutron linuxbridge openvswitch"
|
PROFILES="fluent neutron linuxbridge openvswitch"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -5,5 +5,4 @@ PROJECT_REPO=https://opendev.org/openstack/neutron.git
|
|||||||
PROJECT_REF=stable/ussuri
|
PROJECT_REF=stable/ussuri
|
||||||
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
||||||
DIST_PACKAGES="ethtool lshw"
|
DIST_PACKAGES="ethtool lshw"
|
||||||
PROFILES="fluent neutron linuxbridge openvswitch"
|
PROFILES="fluent neutron linuxbridge openvswitch"
|
||||||
PYTHON3=yes
|
|
@ -6,5 +6,4 @@ PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient"
|
|||||||
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
||||||
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
||||||
CUSTOMIZATION="yum install -y openssh-clients"
|
CUSTOMIZATION="yum install -y openssh-clients"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -7,4 +7,3 @@ PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient"
|
|||||||
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
||||||
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
||||||
CUSTOMIZATION="yum install -y openssh-clients"
|
CUSTOMIZATION="yum install -y openssh-clients"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -7,5 +7,4 @@ PIP_PACKAGES="pycrypto httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \
|
|||||||
python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \
|
python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \
|
||||||
python-swiftclient python-openstackclient"
|
python-swiftclient python-openstackclient"
|
||||||
DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion"
|
DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -7,5 +7,4 @@ PIP_PACKAGES="pycrypto httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \
|
|||||||
python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \
|
python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \
|
||||||
python-swiftclient python-openstackclient"
|
python-swiftclient python-openstackclient"
|
||||||
DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion"
|
DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -8,5 +8,4 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
|
||||||
|
@ -9,4 +9,3 @@ CUSTOMIZATION="\
|
|||||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||||
"
|
"
|
||||||
PYTHON3=yes
|
|
||||||
|
@ -9,3 +9,4 @@ PIP_PACKAGES="pycrypto httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \
|
|||||||
osprofiler beautifulsoup4 oidcauthtools mechanize html5lib webencodings \
|
osprofiler beautifulsoup4 oidcauthtools mechanize html5lib webencodings \
|
||||||
nfv-client"
|
nfv-client"
|
||||||
CUSTOMIZATION="ln -s /usr/local/kubernetes/1.21.8/stage2/usr/bin/kubectl /usr/bin/"
|
CUSTOMIZATION="ln -s /usr/local/kubernetes/1.21.8/stage2/usr/bin/kubectl /usr/bin/"
|
||||||
|
PYTHON3=no
|
||||||
|
Loading…
Reference in New Issue
Block a user