Upgrade openstack docker images for stable/ussuri

Update the directive files to be compatible with ussuri version build. Since openstack ussuri images are based on python3 environment, we have to install rh-python36-wsgi for httpd/apache and copy related files into /etc/httpd/. Without this CUSTOMIZATION, apache could not work. Story: 2007474 Task: 39179 Depends-on: https://review.opendev.org/#/c/731461/ Change-Id: I415ea75eb24d8b1c3151b63efd2e82075e68f26e Signed-off-by: Yu Chengde <yu.chengde@99cloud.com>
2020-03-13 16:38:41 +08:00 · 2020-03-13 16:38:41 +08:00 · b8b897a028
parent 6d317a4e68
commit b8b897a028
30 changed files with 94 additions and 31 deletions
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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
+
--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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
+
--- 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
+
--- 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

--- 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