From 6d317a4e68342e96729a4bf6623ec1cd4d7d384a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 4 Jun 2020 14:41:16 +0200 Subject: [PATCH 1/7] Switch to newer openstackdocstheme and reno versions Switch to openstackdocstheme 2.2.1 and reno 3.1.0 versions. Using these versions will allow especially: * Linking from HTML to PDF document * Allow parallel building of documents * Fix some rendering problems Update Sphinx version as well. Disable openstackdocs_auto_name to use 'project' variable as name. Change pygments_style to 'native' since old theme version always used 'native' and the theme now respects the setting and using 'sphinx' can lead to some strange rendering. openstackdocstheme renames some variables, so follow the renames before the next release removes them. A couple of variables are also not needed anymore, remove them. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: I4a29839379aaf82893f3f34af17f6134091e7064 --- doc/requirements.txt | 6 +++--- doc/source/conf.py | 14 +++++--------- releasenotes/source/conf.py | 12 +++++------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 3a7529d3..f9f7a73d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,5 +1,5 @@ -sphinx>=1.6.2 -openstackdocstheme>=1.26.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 # Release Notes documentation -reno>=0.1.1 # Apache2 +reno>=3.1.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index a4782d84..03cc115b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -27,12 +27,6 @@ project = u'StarlingX Upstream' copyright = u'2018, StarlingX' author = u'StarlingX' -# The short X.Y version -version = u'' -# The full version, including alpha/beta/rc tags -release = u'0.1' - - # -- General configuration --------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. @@ -58,8 +52,10 @@ source_suffix = '.rst' # The master toctree document. master_doc = 'index' -bug_project = '1027' -bug_tag = 'stx.bug' +# openstackdocstheme options +openstackdocs_repo_name = 'starlingx/upstream' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -74,7 +70,7 @@ language = None exclude_patterns = [] # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # -- Options for HTML output ------------------------------------------------- diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 7494090a..1f22c63f 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -31,8 +31,10 @@ extensions = [ 'reno.sphinxext', ] -bug_project = '1027' -bug_tag = 'stx.bug' +# openstackdocstheme options +openstackdocs_repo_name = 'starlingx/upstream' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # Add any paths that contain templates here, relative to this directory. # templates_path = ['_templates'] @@ -82,7 +84,7 @@ exclude_patterns = [] # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -131,10 +133,6 @@ html_theme = 'starlingxdocs' # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True From b8b897a028cda3936f17c5ac6b73af146c5de96b Mon Sep 17 00:00:00 2001 From: yuchengde Date: Fri, 13 Mar 2020 16:38:41 +0800 Subject: [PATCH 2/7] 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 --- .../openstack-aodh/centos/stx-aodh.dev_docker_image | 5 +++++ .../centos/stx-aodh.stable_docker_image | 8 ++++++-- .../centos/stx-ironic.dev_docker_image | 5 +++++ .../centos/stx-ironic.stable_docker_image | 8 ++++++-- .../openstack-panko/centos/stx-panko.dev_docker_image | 5 +++++ .../centos/stx-panko.stable_docker_image | 8 ++++++-- .../centos/stx-barbican.dev_docker_image | 2 ++ .../centos/stx-barbican.stable_docker_image | 3 ++- .../centos/stx-ceilometer.dev_docker_image | 1 + .../centos/stx-ceilometer.stable_docker_image | 4 ++-- .../python-cinder/centos/stx-cinder.dev_docker_image | 1 + .../centos/stx-cinder.stable_docker_image | 4 ++-- .../python-glance/centos/stx-glance.dev_docker_image | 1 + .../centos/stx-glance.stable_docker_image | 4 ++-- .../centos/stx-gnocchi.dev_docker_image | 1 + .../centos/stx-gnocchi.stable_docker_image | 1 + .../openstack-heat/centos/stx-heat.dev_docker_image | 1 + .../centos/stx-heat.stable_docker_image | 4 ++-- .../centos/stx-horizon.dev_docker_image | 8 +++++--- .../centos/stx-horizon.stable_docker_image | 11 ++++++----- .../centos/stx-keystone.dev_docker_image | 5 +++++ .../centos/stx-keystone.stable_docker_image | 8 ++++++-- .../centos/stx-neutron.dev_docker_image | 1 + .../centos/stx-neutron.stable_docker_image | 4 ++-- .../python-nova/centos/stx-nova.dev_docker_image | 1 + .../python-nova/centos/stx-nova.stable_docker_image | 4 ++-- .../centos/stx-openstackclient.dev_docker_image | 2 ++ .../centos/stx-openstackclient.stable_docker_image | 2 ++ .../centos/stx-placement.dev_docker_image | 5 +++++ .../centos/stx-placement.stable_docker_image | 8 ++++++-- 30 files changed, 94 insertions(+), 31 deletions(-) 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 From e96d8b71778413710cd369cc32c1f2a9ee95e986 Mon Sep 17 00:00:00 2001 From: Zhipeng Liu Date: Fri, 10 Jul 2020 18:37:25 +0800 Subject: [PATCH 3/7] Fix gnocchi-api could not start up issue After using python3 to build image, need change related profile and customization like we did for other service in directives file. Test pass for openstack apply with 4 additional services enabled Partial-Bug: 1886819 Change-Id: Ifdfce220b43166345888b1384f62c4ab8f46ba27 Signed-off-by: Zhipeng Liu --- .../python-gnocchi/centos/stx-gnocchi.dev_docker_image | 6 +++++- .../python-gnocchi/centos/stx-gnocchi.stable_docker_image | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image index 6b030922..ec7815a0 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image @@ -3,7 +3,11 @@ LABEL=stx-gnocchi PROJECT=gnocchi PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" -DIST_PACKAGES="python-rados" +DIST_PACKAGES="python3-rados" PROFILES="gnocchi 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-gnocchi/centos/stx-gnocchi.stable_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image index d4f48588..f68eac94 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image @@ -4,7 +4,11 @@ PROJECT=gnocchi PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PROJECT_REF=4.3.2 PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" -DIST_PACKAGES="python-rados" +DIST_PACKAGES="python3-rados" PROFILES="gnocchi 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 From 4a545ec5844cc24a942b5eafd90dfa69ff68a921 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 17 Dec 2020 13:21:18 -0500 Subject: [PATCH 4/7] Add auto-version for remaining stx/upstream packages Update remaining StarlingX packages with hardcoded TIS_PATCH_VER to use PKG_GITREVCOUNT where possible, with offsets as needed to ensure the version is incremented above the hardcoded version. Story: 2008455 Task: 41458 Signed-off-by: Don Penney Change-Id: Iaf71fdb3f9c79573ef64f6c82b1a2120d224d959 --- openstack/openstack-os-vif/centos/build_srpm.data | 2 +- openstack/python-horizon/centos/build_srpm.data | 2 +- openstack/python-keystone/centos/build_srpm.data | 2 +- openstack/python-openstackdocstheme/centos/build_srpm.data | 2 +- openstack/python-osc-lib/centos/build_srpm.data | 2 +- openstack/python-oslo-messaging/centos/build_srpm.data | 2 +- openstack/python-wsme/centos/build_srpm.data | 2 +- openstack/rabbitmq-server/centos/build_srpm.data | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack/openstack-os-vif/centos/build_srpm.data b/openstack/openstack-os-vif/centos/build_srpm.data index 1ca8cb84..69abd61b 100644 --- a/openstack/openstack-os-vif/centos/build_srpm.data +++ b/openstack/openstack-os-vif/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openstack/python-horizon/centos/build_srpm.data b/openstack/python-horizon/centos/build_srpm.data index fc9e6e1e..d1dc9f5b 100755 --- a/openstack/python-horizon/centos/build_srpm.data +++ b/openstack/python-horizon/centos/build_srpm.data @@ -2,4 +2,4 @@ TAR_NAME=horizon SRC_DIR="$CGCS_BASE/git/horizon" COPY_LIST="$FILES_BASE/*" TIS_BASE_SRCREV=817ee34d5a57409dc9945e6151a43d6747e5cc02 -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openstack/python-keystone/centos/build_srpm.data b/openstack/python-keystone/centos/build_srpm.data index bd49b893..1b6db88c 100644 --- a/openstack/python-keystone/centos/build_srpm.data +++ b/openstack/python-keystone/centos/build_srpm.data @@ -1,2 +1,2 @@ -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT COPY_LIST="$FILES_BASE/*" diff --git a/openstack/python-openstackdocstheme/centos/build_srpm.data b/openstack/python-openstackdocstheme/centos/build_srpm.data index 8aeb5536..69abd61b 100644 --- a/openstack/python-openstackdocstheme/centos/build_srpm.data +++ b/openstack/python-openstackdocstheme/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openstack/python-osc-lib/centos/build_srpm.data b/openstack/python-osc-lib/centos/build_srpm.data index d3f64f33..69abd61b 100644 --- a/openstack/python-osc-lib/centos/build_srpm.data +++ b/openstack/python-osc-lib/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=3 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openstack/python-oslo-messaging/centos/build_srpm.data b/openstack/python-oslo-messaging/centos/build_srpm.data index 0eac83bb..ade646ee 100644 --- a/openstack/python-oslo-messaging/centos/build_srpm.data +++ b/openstack/python-oslo-messaging/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=4 +TIS_PATCH_VER=PKG_GITREVCOUNT+1 diff --git a/openstack/python-wsme/centos/build_srpm.data b/openstack/python-wsme/centos/build_srpm.data index d3f64f33..69abd61b 100644 --- a/openstack/python-wsme/centos/build_srpm.data +++ b/openstack/python-wsme/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=3 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openstack/rabbitmq-server/centos/build_srpm.data b/openstack/rabbitmq-server/centos/build_srpm.data index ccee3891..61891260 100644 --- a/openstack/rabbitmq-server/centos/build_srpm.data +++ b/openstack/rabbitmq-server/centos/build_srpm.data @@ -1,2 +1,2 @@ -TIS_PATCH_VER=7 +TIS_PATCH_VER=PKG_GITREVCOUNT+5 BUILD_IS_SLOW=3 From d7573c28f9257280239b37985f142cfd416e443c Mon Sep 17 00:00:00 2001 From: "Chen, Haochuan Z" Date: Thu, 7 Jan 2021 13:33:22 +0800 Subject: [PATCH 5/7] WA to fix mysqlclient version conflict with Django https://stackoverflow.com/questions/55657752/django-installing-mysqlclient-error-mysqlclient-1-3-13-or-newer-is-required Fix with guide from stackoverflow. After openstack image upgrade to ussuri, Django upgrade to 2.2, which request mysqlclient newer than 1.3.13, conflict with version 0.9.3 in current image. Fix with WA in above link, and currently we use pymysql not mysql. Closes-Bug: 1908117 Change-Id: Ic7054c6736993394d92bb0aec25397fd22f84d31 Signed-off-by: Chen, Haochuan Z --- openstack/python-horizon/centos/stx-horizon.dev_docker_image | 2 ++ openstack/python-horizon/centos/stx-horizon.stable_docker_image | 2 ++ 2 files changed, 4 insertions(+) diff --git a/openstack/python-horizon/centos/stx-horizon.dev_docker_image b/openstack/python-horizon/centos/stx-horizon.dev_docker_image index 98928503..d7f89083 100644 --- a/openstack/python-horizon/centos/stx-horizon.dev_docker_image +++ b/openstack/python-horizon/centos/stx-horizon.dev_docker_image @@ -10,6 +10,8 @@ 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 -e 's/raise ImproperlyConfigured..mysqlclient 1.3.13 or newer is required.*/pass/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/base.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 \ " 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 0d14d5d9..bb1fac31 100644 --- a/openstack/python-horizon/centos/stx-horizon.stable_docker_image +++ b/openstack/python-horizon/centos/stx-horizon.stable_docker_image @@ -11,6 +11,8 @@ 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 -e 's/raise ImproperlyConfigured..mysqlclient 1.3.13 or newer is required.*/pass/' /var/lib/openstack/lib/python3.6/site-packages/django/db/backends/mysql/base.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 \ " PYTHON3=yes From 341eb6980c3a290f3633616bef0f32152a51b41f Mon Sep 17 00:00:00 2001 From: Daniel Pereira Date: Wed, 10 Feb 2021 15:44:28 -0300 Subject: [PATCH 6/7] Update cinder directives build file Currently, cinder docker image doesn't contain nfs mount helpers installed, so trying to mount a NFS volume on a cinder-backup container fails. In order to enable support for NFS backend on cinder-backup, we need to install the nfs-utils package on cinder image, so that cinder-backup is able to mount NFS volumes. Task: 41796 Story: 2008613 Change-Id: Ib8e4675069292dc43f98ff55c25626a19ed37b12 Signed-off-by: Daniel Pereira --- openstack/python-cinder/centos/stx-cinder.dev_docker_image | 2 +- openstack/python-cinder/centos/stx-cinder.stable_docker_image | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openstack/python-cinder/centos/stx-cinder.dev_docker_image b/openstack/python-cinder/centos/stx-cinder.dev_docker_image index 0c2b9050..a0508f33 100644 --- a/openstack/python-cinder/centos/stx-cinder.dev_docker_image +++ b/openstack/python-cinder/centos/stx-cinder.dev_docker_image @@ -2,7 +2,7 @@ BUILDER=loci LABEL=stx-cinder PROJECT=cinder PROJECT_REPO=https://opendev.org/openstack/cinder.git +DIST_PACKAGES="nfs-utils" 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 f3c43e47..3de5f830 100644 --- a/openstack/python-cinder/centos/stx-cinder.stable_docker_image +++ b/openstack/python-cinder/centos/stx-cinder.stable_docker_image @@ -3,6 +3,7 @@ LABEL=stx-cinder PROJECT=cinder PROJECT_REPO=https://opendev.org/openstack/cinder.git PROJECT_REF=stable/ussuri +DIST_PACKAGES="nfs-utils" PIP_PACKAGES="pycrypto python-swiftclient pylint" PROFILES="fluent cinder lvm ceph qemu" PYTHON3=yes From a4046414b634e027f646be58502f3af2ea2329f0 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Mon, 26 Apr 2021 16:22:26 -0400 Subject: [PATCH 7/7] Enforce "cannot reuse the last 2 passwords" for ks users Currently the "unique_last_password_count" attribute in keystone configuration is set to "2", which enforces "cannot reuse the last 1 passwords" in history instead of "cannot reuse the last 2 passwords" stated in security document. This update changed "unique_last_password_count" attribute to "3" so that keystone users password change rule complies with the document. Closes-Bug: 1924772 Change-Id: I6a2de54336c7253022d49ecb118a315a7825c889 Signed-off-by: Andy Ning --- openstack/python-keystone/centos/files/password-rules.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstack/python-keystone/centos/files/password-rules.conf b/openstack/python-keystone/centos/files/password-rules.conf index a110cd4b..e7ce6560 100644 --- a/openstack/python-keystone/centos/files/password-rules.conf +++ b/openstack/python-keystone/centos/files/password-rules.conf @@ -18,7 +18,7 @@ # feature, values must be greater than 1. This feature depends on the `sql` # backend for the `[identity] driver`. (integer value) # Minimum value: 1 -unique_last_password_count = 2 +unique_last_password_count = 3 # The regular expression used to validate password strength requirements. By # default, the regular expression will match any password. The following is an