diff --git a/openstack/openstack-aodh/centos/stx-aodh.dev_docker_image b/openstack/openstack-aodh/centos/stx-aodh.dev_docker_image index ae6fed9b..f8846f20 100644 --- a/openstack/openstack-aodh/centos/stx-aodh.dev_docker_image +++ b/openstack/openstack-aodh/centos/stx-aodh.dev_docker_image @@ -4,4 +4,9 @@ PROJECT=aodh PROJECT_REPO=https://opendev.org/openstack/aodh.git PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" PROFILES="apache" +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image b/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image index 79b07c1f..af1d8169 100644 --- a/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image +++ b/openstack/openstack-aodh/centos/stx-aodh.stable_docker_image @@ -2,7 +2,11 @@ BUILDER=loci LABEL=stx-aodh PROJECT=aodh PROJECT_REPO=https://opendev.org/openstack/aodh.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" PROFILES="apache" - +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/openstack-ironic/centos/stx-ironic.dev_docker_image b/openstack/openstack-ironic/centos/stx-ironic.dev_docker_image index df9c9b10..cbd32ab0 100644 --- a/openstack/openstack-ironic/centos/stx-ironic.dev_docker_image +++ b/openstack/openstack-ironic/centos/stx-ironic.dev_docker_image @@ -5,4 +5,9 @@ PROJECT_REPO=https://opendev.org/openstack/ironic.git PIP_PACKAGES="pylint alembic pysnmp" DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils" PROFILES="ironic apache" +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image b/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image index de4c4941..885f27e7 100644 --- a/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image +++ b/openstack/openstack-ironic/centos/stx-ironic.stable_docker_image @@ -2,8 +2,12 @@ BUILDER=loci LABEL=stx-ironic PROJECT=ironic PROJECT_REPO=https://opendev.org/openstack/ironic.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pylint alembic pysnmp" DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils" PROFILES="ironic apache" - +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/openstack-panko/centos/stx-panko.dev_docker_image b/openstack/openstack-panko/centos/stx-panko.dev_docker_image index a7f30e13..1f0ebdea 100644 --- a/openstack/openstack-panko/centos/stx-panko.dev_docker_image +++ b/openstack/openstack-panko/centos/stx-panko.dev_docker_image @@ -4,4 +4,9 @@ PROJECT=panko PROJECT_REPO=https://opendev.org/openstack/panko.git PIP_PACKAGES="pylint python-openstackclient pankoclient" PROFILES="apache" +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/openstack-panko/centos/stx-panko.stable_docker_image b/openstack/openstack-panko/centos/stx-panko.stable_docker_image index 5f8464d7..858fc17f 100644 --- a/openstack/openstack-panko/centos/stx-panko.stable_docker_image +++ b/openstack/openstack-panko/centos/stx-panko.stable_docker_image @@ -2,7 +2,11 @@ BUILDER=loci LABEL=stx-panko PROJECT=panko PROJECT_REPO=https://opendev.org/openstack/panko.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pylint python-openstackclient pankoclient" PROFILES="apache" - +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/python-barbican/centos/stx-barbican.dev_docker_image b/openstack/python-barbican/centos/stx-barbican.dev_docker_image index 5fe8a3ba..10cb953b 100644 --- a/openstack/python-barbican/centos/stx-barbican.dev_docker_image +++ b/openstack/python-barbican/centos/stx-barbican.dev_docker_image @@ -4,3 +4,5 @@ PROJECT=barbican PROJECT_REPO=https://opendev.org/openstack/barbican.git PIP_PACKAGES="pycrypto" PROFILES="fluent" +PYTHON3=yes + diff --git a/openstack/python-barbican/centos/stx-barbican.stable_docker_image b/openstack/python-barbican/centos/stx-barbican.stable_docker_image index 34326ffe..ddc378b4 100644 --- a/openstack/python-barbican/centos/stx-barbican.stable_docker_image +++ b/openstack/python-barbican/centos/stx-barbican.stable_docker_image @@ -2,6 +2,7 @@ BUILDER=loci LABEL=stx-barbican PROJECT=barbican PROJECT_REPO=https://opendev.org/openstack/barbican.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto" PROFILES="fluent" +PYTHON3=yes diff --git a/openstack/python-ceilometer/centos/stx-ceilometer.dev_docker_image b/openstack/python-ceilometer/centos/stx-ceilometer.dev_docker_image index 3d6e27e4..96b35864 100644 --- a/openstack/python-ceilometer/centos/stx-ceilometer.dev_docker_image +++ b/openstack/python-ceilometer/centos/stx-ceilometer.dev_docker_image @@ -4,4 +4,5 @@ PROJECT=ceilometer PROJECT_REPO=https://opendev.org/openstack/ceilometer.git PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient" DIST_PACKAGES="libvirt ipmitool" +PYTHON3=yes diff --git a/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image b/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image index 83f61d6b..975b72d3 100644 --- a/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image +++ b/openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-ceilometer PROJECT=ceilometer PROJECT_REPO=https://opendev.org/openstack/ceilometer.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient" DIST_PACKAGES="libvirt ipmitool" - +PYTHON3=yes diff --git a/openstack/python-cinder/centos/stx-cinder.dev_docker_image b/openstack/python-cinder/centos/stx-cinder.dev_docker_image index 47ca4835..0c2b9050 100644 --- a/openstack/python-cinder/centos/stx-cinder.dev_docker_image +++ b/openstack/python-cinder/centos/stx-cinder.dev_docker_image @@ -4,4 +4,5 @@ PROJECT=cinder PROJECT_REPO=https://opendev.org/openstack/cinder.git PIP_PACKAGES="pycrypto python-swiftclient pylint" PROFILES="fluent cinder lvm ceph qemu" +PYTHON3=yes diff --git a/openstack/python-cinder/centos/stx-cinder.stable_docker_image b/openstack/python-cinder/centos/stx-cinder.stable_docker_image index 18d3e7ba..f3c43e47 100644 --- a/openstack/python-cinder/centos/stx-cinder.stable_docker_image +++ b/openstack/python-cinder/centos/stx-cinder.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-cinder PROJECT=cinder PROJECT_REPO=https://opendev.org/openstack/cinder.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto python-swiftclient pylint" PROFILES="fluent cinder lvm ceph qemu" - +PYTHON3=yes diff --git a/openstack/python-glance/centos/stx-glance.dev_docker_image b/openstack/python-glance/centos/stx-glance.dev_docker_image index 2eaf26cb..be3648bc 100644 --- a/openstack/python-glance/centos/stx-glance.dev_docker_image +++ b/openstack/python-glance/centos/stx-glance.dev_docker_image @@ -5,4 +5,5 @@ PROJECT_REPO=https://opendev.org/openstack/glance.git PIP_PACKAGES="pycrypto python-swiftclient psutil pylint" DIST_PACKAGES="postgresql-libs" PROFILES="fluent glance ceph" +PYTHON3=yes diff --git a/openstack/python-glance/centos/stx-glance.stable_docker_image b/openstack/python-glance/centos/stx-glance.stable_docker_image index 525e1d29..1e907992 100644 --- a/openstack/python-glance/centos/stx-glance.stable_docker_image +++ b/openstack/python-glance/centos/stx-glance.stable_docker_image @@ -2,8 +2,8 @@ BUILDER=loci LABEL=stx-glance PROJECT=glance PROJECT_REPO=https://opendev.org/openstack/glance.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto python-swiftclient psutil pylint" DIST_PACKAGES="postgresql-libs" PROFILES="fluent glance ceph" - +PYTHON3=yes diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image index 44d69001..6b030922 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image @@ -5,4 +5,5 @@ PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" DIST_PACKAGES="python-rados" PROFILES="gnocchi apache" +PYTHON3=yes diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image index b3fd5ca5..d4f48588 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image @@ -6,4 +6,5 @@ PROJECT_REF=4.3.2 PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" DIST_PACKAGES="python-rados" PROFILES="gnocchi apache" +PYTHON3=yes diff --git a/openstack/python-heat/openstack-heat/centos/stx-heat.dev_docker_image b/openstack/python-heat/openstack-heat/centos/stx-heat.dev_docker_image index 833d63d4..ca22385a 100644 --- a/openstack/python-heat/openstack-heat/centos/stx-heat.dev_docker_image +++ b/openstack/python-heat/openstack-heat/centos/stx-heat.dev_docker_image @@ -4,4 +4,5 @@ PROJECT=heat PROJECT_REPO=https://opendev.org/openstack/heat.git PIP_PACKAGES="pycrypto pylint" PROFILES="fluent heat apache" +PYTHON3=yes diff --git a/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image b/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image index f98c097c..0ed7f7c3 100644 --- a/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image +++ b/openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-heat PROJECT=heat PROJECT_REPO=https://opendev.org/openstack/heat.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto pylint" PROFILES="fluent heat apache" - +PYTHON3=yes diff --git a/openstack/python-horizon/centos/stx-horizon.dev_docker_image b/openstack/python-horizon/centos/stx-horizon.dev_docker_image index 06141157..98928503 100644 --- a/openstack/python-horizon/centos/stx-horizon.dev_docker_image +++ b/openstack/python-horizon/centos/stx-horizon.dev_docker_image @@ -4,11 +4,13 @@ PROJECT=horizon PROJECT_REPO=https://opendev.org/openstack/horizon.git PIP_PACKAGES="pycrypto python-ceilometerclient \ coverage pyudev \ - ldap starlingx-dashboard pylint" + ldap pylint" PROFILES="fluent horizon apache" 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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ && \ ln -s /bin/true /usr/bin/a2enmod && \ - sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf && \ - ln -s /var/lib/openstack/lib/python2.7/site-packages/starlingx_dashboard/themes/starlingx /var/lib/openstack/lib/python2.7/site-packages/openstack_dashboard/themes/starlingx \ + sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \ " +PYTHON3=yes diff --git a/openstack/python-horizon/centos/stx-horizon.stable_docker_image b/openstack/python-horizon/centos/stx-horizon.stable_docker_image index f8490d26..0d14d5d9 100644 --- a/openstack/python-horizon/centos/stx-horizon.stable_docker_image +++ b/openstack/python-horizon/centos/stx-horizon.stable_docker_image @@ -2,14 +2,15 @@ BUILDER=loci LABEL=stx-horizon PROJECT=horizon PROJECT_REPO=https://opendev.org/openstack/horizon.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto python-ceilometerclient \ coverage pyudev \ - ldap starlingx-dashboard pylint" + ldap pylint" PROFILES="fluent horizon apache" 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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ && \ ln -s /bin/true /usr/bin/a2enmod && \ - sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf && \ - ln -s /var/lib/openstack/lib/python2.7/site-packages/starlingx_dashboard/themes/starlingx /var/lib/openstack/lib/python2.7/site-packages/openstack_dashboard/themes/starlingx \ + sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf \ " - +PYTHON3=yes diff --git a/openstack/python-keystone/centos/stx-keystone.dev_docker_image b/openstack/python-keystone/centos/stx-keystone.dev_docker_image index baece43a..c1841da9 100644 --- a/openstack/python-keystone/centos/stx-keystone.dev_docker_image +++ b/openstack/python-keystone/centos/stx-keystone.dev_docker_image @@ -4,4 +4,9 @@ PROJECT=keystone PROJECT_REPO=https://opendev.org/openstack/keystone.git PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint" PROFILES="fluent apache" +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/python-keystone/centos/stx-keystone.stable_docker_image b/openstack/python-keystone/centos/stx-keystone.stable_docker_image index bd63f5b0..8f8c70a7 100644 --- a/openstack/python-keystone/centos/stx-keystone.stable_docker_image +++ b/openstack/python-keystone/centos/stx-keystone.stable_docker_image @@ -2,7 +2,11 @@ BUILDER=loci LABEL=stx-keystone PROJECT=keystone PROJECT_REPO=https://opendev.org/openstack/keystone.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint" PROFILES="fluent apache" - +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/python-neutron/centos/stx-neutron.dev_docker_image b/openstack/python-neutron/centos/stx-neutron.dev_docker_image index b48b004b..02482434 100644 --- a/openstack/python-neutron/centos/stx-neutron.dev_docker_image +++ b/openstack/python-neutron/centos/stx-neutron.dev_docker_image @@ -5,4 +5,5 @@ PROJECT_REPO=https://opendev.org/openstack/neutron.git PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" DIST_PACKAGES="ethtool lshw" PROFILES="fluent neutron linuxbridge openvswitch" +PYTHON3=yes diff --git a/openstack/python-neutron/centos/stx-neutron.stable_docker_image b/openstack/python-neutron/centos/stx-neutron.stable_docker_image index 305b5d04..5dfc2728 100644 --- a/openstack/python-neutron/centos/stx-neutron.stable_docker_image +++ b/openstack/python-neutron/centos/stx-neutron.stable_docker_image @@ -2,8 +2,8 @@ BUILDER=loci LABEL=stx-neutron PROJECT=neutron PROJECT_REPO=https://opendev.org/openstack/neutron.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" DIST_PACKAGES="ethtool lshw" PROFILES="fluent neutron linuxbridge openvswitch" - +PYTHON3=yes \ No newline at end of file diff --git a/openstack/python-nova/centos/stx-nova.dev_docker_image b/openstack/python-nova/centos/stx-nova.dev_docker_image index 9d7b2613..a9a44382 100644 --- a/openstack/python-nova/centos/stx-nova.dev_docker_image +++ b/openstack/python-nova/centos/stx-nova.dev_docker_image @@ -6,4 +6,5 @@ PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient" DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs" PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" CUSTOMIZATION="yum install -y openssh-clients" +PYTHON3=yes diff --git a/openstack/python-nova/centos/stx-nova.stable_docker_image b/openstack/python-nova/centos/stx-nova.stable_docker_image index 3e475e8a..be9006e4 100644 --- a/openstack/python-nova/centos/stx-nova.stable_docker_image +++ b/openstack/python-nova/centos/stx-nova.stable_docker_image @@ -2,9 +2,9 @@ BUILDER=loci LABEL=stx-nova PROJECT=nova PROJECT_REPO=https://opendev.org/openstack/nova.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient" DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs" PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" CUSTOMIZATION="yum install -y openssh-clients" - +PYTHON3=yes diff --git a/openstack/python-openstackclient/centos/stx-openstackclient.dev_docker_image b/openstack/python-openstackclient/centos/stx-openstackclient.dev_docker_image index 1260c149..780a6eda 100644 --- a/openstack/python-openstackclient/centos/stx-openstackclient.dev_docker_image +++ b/openstack/python-openstackclient/centos/stx-openstackclient.dev_docker_image @@ -7,3 +7,5 @@ PIP_PACKAGES="pycrypto httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \ python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \ python-swiftclient python-openstackclient" DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion" +PYTHON3=yes + diff --git a/openstack/python-openstackclient/centos/stx-openstackclient.stable_docker_image b/openstack/python-openstackclient/centos/stx-openstackclient.stable_docker_image index 1260c149..780a6eda 100644 --- a/openstack/python-openstackclient/centos/stx-openstackclient.stable_docker_image +++ b/openstack/python-openstackclient/centos/stx-openstackclient.stable_docker_image @@ -7,3 +7,5 @@ PIP_PACKAGES="pycrypto httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \ python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \ python-swiftclient python-openstackclient" DIST_PACKAGES="python-devel libffi-devel openssl-devel which bash-completion" +PYTHON3=yes + diff --git a/openstack/python-placement/centos/stx-placement.dev_docker_image b/openstack/python-placement/centos/stx-placement.dev_docker_image index f92c8670..ca4e8ffd 100644 --- a/openstack/python-placement/centos/stx-placement.dev_docker_image +++ b/openstack/python-placement/centos/stx-placement.dev_docker_image @@ -4,4 +4,9 @@ PROJECT=placement PROJECT_REPO=https://opendev.org/openstack/placement.git PIP_PACKAGES="pycrypto httplib2 pylint" PROFILES="apache" +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes diff --git a/openstack/python-placement/centos/stx-placement.stable_docker_image b/openstack/python-placement/centos/stx-placement.stable_docker_image index 86d48b3c..ee1d29eb 100644 --- a/openstack/python-placement/centos/stx-placement.stable_docker_image +++ b/openstack/python-placement/centos/stx-placement.stable_docker_image @@ -2,7 +2,11 @@ BUILDER=loci LABEL=stx-placement PROJECT=placement PROJECT_REPO=https://opendev.org/openstack/placement.git -PROJECT_REF=stable/train +PROJECT_REF=stable/ussuri PIP_PACKAGES="pycrypto httplib2 pylint" PROFILES="apache" - +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/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \ +" +PYTHON3=yes