starlingx/upstream
Code Issues Proposed changes

Merge remote-tracking branch 'origin/master' into f/centos8

Browse Source 
Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I257ba69807351a5624481bc12b246bf129135a2f
This commit is contained in:
Charles Short 2021-05-19 13:14:58 -04:00
commit ab2f84da41
42 changed files with 132 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/requirements.txt
View File

@ -1,5 +1,5 @@
sphinx>=1.6.2 sphinx>=2.0.0,!=2.1.0 # BSD
openstackdocstheme>=1.26.0 # Apache-2.0 openstackdocstheme>=2.2.1 # Apache-2.0
# Release Notes documentation # Release Notes documentation
reno>=0.1.1 # Apache2 reno>=3.1.0 # Apache-2.0

14
doc/source/conf.py
View File

@ -27,12 +27,6 @@ project = u'StarlingX Upstream'
copyright = u'2018, StarlingX' copyright = u'2018, StarlingX'
author = u'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 --------------------------------------------------- # -- General configuration ---------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here. # If your documentation needs a minimal Sphinx version, state it here.
@ -58,8 +52,10 @@ source_suffix = '.rst'
# The master toctree document. # The master toctree document.
master_doc = 'index' master_doc = 'index'
bug_project = '1027' # openstackdocstheme options
bug_tag = 'stx.bug' openstackdocs_repo_name = 'starlingx/upstream'
openstackdocs_use_storyboard = True
openstackdocs_auto_name = False
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
@ -74,7 +70,7 @@ language = None
exclude_patterns = [] exclude_patterns = []
# The name of the Pygments (syntax highlighting) style to use. # The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx' pygments_style = 'native'
# -- Options for HTML output ------------------------------------------------- # -- Options for HTML output -------------------------------------------------

5
openstack/openstack-aodh/centos/stx-aodh.dev_docker_image
View File

@ -4,4 +4,9 @@ PROJECT=aodh
PROJECT_REPO=https://opendev.org/openstack/aodh.git PROJECT_REPO=https://opendev.org/openstack/aodh.git
PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
PROFILES="apache" 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

8
openstack/openstack-aodh/centos/stx-aodh.stable_docker_image
View File

@ -2,7 +2,11 @@ BUILDER=loci
LABEL=stx-aodh LABEL=stx-aodh
PROJECT=aodh PROJECT=aodh
PROJECT_REPO=https://opendev.org/openstack/aodh.git PROJECT_REPO=https://opendev.org/openstack/aodh.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient" PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
PROFILES="apache" 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

5
openstack/openstack-ironic/centos/stx-ironic.dev_docker_image
View File

@ -5,4 +5,9 @@ PROJECT_REPO=https://opendev.org/openstack/ironic.git
PIP_PACKAGES="pylint alembic pysnmp" PIP_PACKAGES="pylint alembic pysnmp"
DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils" DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils"
PROFILES="ironic apache" 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

8
openstack/openstack-ironic/centos/stx-ironic.stable_docker_image
View File

@ -2,8 +2,12 @@ BUILDER=loci
LABEL=stx-ironic LABEL=stx-ironic
PROJECT=ironic PROJECT=ironic
PROJECT_REPO=https://opendev.org/openstack/ironic.git PROJECT_REPO=https://opendev.org/openstack/ironic.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pylint alembic pysnmp" PIP_PACKAGES="pylint alembic pysnmp"
DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils" DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils"
PROFILES="ironic apache" 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

2
openstack/openstack-os-vif/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

5
openstack/openstack-panko/centos/stx-panko.dev_docker_image
View File

@ -4,4 +4,9 @@ PROJECT=panko
PROJECT_REPO=https://opendev.org/openstack/panko.git PROJECT_REPO=https://opendev.org/openstack/panko.git
PIP_PACKAGES="pylint python-openstackclient pankoclient" PIP_PACKAGES="pylint python-openstackclient pankoclient"
PROFILES="apache" 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

8
openstack/openstack-panko/centos/stx-panko.stable_docker_image
View File

@ -2,7 +2,11 @@ BUILDER=loci
LABEL=stx-panko LABEL=stx-panko
PROJECT=panko PROJECT=panko
PROJECT_REPO=https://opendev.org/openstack/panko.git PROJECT_REPO=https://opendev.org/openstack/panko.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pylint python-openstackclient pankoclient" PIP_PACKAGES="pylint python-openstackclient pankoclient"
PROFILES="apache" 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

2
openstack/python-barbican/centos/stx-barbican.dev_docker_image
View File

@ -4,3 +4,5 @@ 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

3
openstack/python-barbican/centos/stx-barbican.stable_docker_image
View File

@ -2,6 +2,7 @@ BUILDER=loci
LABEL=stx-barbican LABEL=stx-barbican
PROJECT=barbican PROJECT=barbican
PROJECT_REPO=https://opendev.org/openstack/barbican.git PROJECT_REPO=https://opendev.org/openstack/barbican.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pycrypto" PIP_PACKAGES="pycrypto"
PROFILES="fluent" PROFILES="fluent"
PYTHON3=yes

1
openstack/python-ceilometer/centos/stx-ceilometer.dev_docker_image
View File

@ -4,4 +4,5 @@ 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

4
openstack/python-ceilometer/centos/stx-ceilometer.stable_docker_image
View File

@ -2,7 +2,7 @@ BUILDER=loci
LABEL=stx-ceilometer LABEL=stx-ceilometer
PROJECT=ceilometer PROJECT=ceilometer
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git 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" PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
DIST_PACKAGES="libvirt ipmitool" DIST_PACKAGES="libvirt ipmitool"
PYTHON3=yes

3
openstack/python-cinder/centos/stx-cinder.dev_docker_image
View File

@ -2,6 +2,7 @@ BUILDER=loci
LABEL=stx-cinder LABEL=stx-cinder
PROJECT=cinder PROJECT=cinder
PROJECT_REPO=https://opendev.org/openstack/cinder.git PROJECT_REPO=https://opendev.org/openstack/cinder.git
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
openstack/python-cinder/centos/stx-cinder.stable_docker_image
View File

@ -2,7 +2,8 @@ BUILDER=loci
LABEL=stx-cinder LABEL=stx-cinder
PROJECT=cinder PROJECT=cinder
PROJECT_REPO=https://opendev.org/openstack/cinder.git PROJECT_REPO=https://opendev.org/openstack/cinder.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
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

1
openstack/python-glance/centos/stx-glance.dev_docker_image
View File

@ -5,4 +5,5 @@ 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

4
openstack/python-glance/centos/stx-glance.stable_docker_image
View File

@ -2,8 +2,8 @@ BUILDER=loci
LABEL=stx-glance LABEL=stx-glance
PROJECT=glance PROJECT=glance
PROJECT_REPO=https://opendev.org/openstack/glance.git PROJECT_REPO=https://opendev.org/openstack/glance.git
PROJECT_REF=stable/train 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

7
openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image
View File

@ -3,6 +3,11 @@ LABEL=stx-gnocchi
PROJECT=gnocchi PROJECT=gnocchi
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados" DIST_PACKAGES="python3-rados"
PROFILES="gnocchi apache" 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

7
openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image
View File

@ -4,6 +4,11 @@ PROJECT=gnocchi
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
PROJECT_REF=4.3.2 PROJECT_REF=4.3.2
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados" DIST_PACKAGES="python3-rados"
PROFILES="gnocchi apache" 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

1
openstack/python-heat/openstack-heat/centos/stx-heat.dev_docker_image
View File

@ -4,4 +4,5 @@ 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

4
openstack/python-heat/openstack-heat/centos/stx-heat.stable_docker_image
View File

@ -2,7 +2,7 @@ BUILDER=loci
LABEL=stx-heat LABEL=stx-heat
PROJECT=heat PROJECT=heat
PROJECT_REPO=https://opendev.org/openstack/heat.git PROJECT_REPO=https://opendev.org/openstack/heat.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pycrypto pylint" PIP_PACKAGES="pycrypto pylint"
PROFILES="fluent heat apache" PROFILES="fluent heat apache"
PYTHON3=yes

2
openstack/python-horizon/centos/build_srpm.data
View File

@ -2,4 +2,4 @@ TAR_NAME=horizon
SRC_DIR="$CGCS_BASE/git/horizon" SRC_DIR="$CGCS_BASE/git/horizon"
COPY_LIST="$FILES_BASE/*" COPY_LIST="$FILES_BASE/*"
TIS_BASE_SRCREV=817ee34d5a57409dc9945e6151a43d6747e5cc02 TIS_BASE_SRCREV=817ee34d5a57409dc9945e6151a43d6747e5cc02
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

10
openstack/python-horizon/centos/stx-horizon.dev_docker_image
View File

@ -4,11 +4,15 @@ PROJECT=horizon
PROJECT_REPO=https://opendev.org/openstack/horizon.git PROJECT_REPO=https://opendev.org/openstack/horizon.git
PIP_PACKAGES="pycrypto python-ceilometerclient \ PIP_PACKAGES="pycrypto python-ceilometerclient \
coverage pyudev \ coverage pyudev \
ldap starlingx-dashboard pylint" ldap pylint"
PROFILES="fluent horizon apache" PROFILES="fluent horizon apache"
CUSTOMIZATION="\ 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 && \ ln -s /bin/true /usr/bin/a2enmod && \
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf && \ 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 && \
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 -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

13
openstack/python-horizon/centos/stx-horizon.stable_docker_image
View File

@ -2,14 +2,17 @@ BUILDER=loci
LABEL=stx-horizon LABEL=stx-horizon
PROJECT=horizon PROJECT=horizon
PROJECT_REPO=https://opendev.org/openstack/horizon.git PROJECT_REPO=https://opendev.org/openstack/horizon.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pycrypto python-ceilometerclient \ PIP_PACKAGES="pycrypto python-ceilometerclient \
coverage pyudev \ coverage pyudev \
ldap starlingx-dashboard pylint" ldap pylint"
PROFILES="fluent horizon apache" PROFILES="fluent horizon apache"
CUSTOMIZATION="\ 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 && \ ln -s /bin/true /usr/bin/a2enmod && \
sed -i 's/Listen 80/#Listen 80/' /etc/httpd/conf/httpd.conf && \ 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 && \
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 -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

2
openstack/python-keystone/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT
COPY_LIST="$FILES_BASE/*" COPY_LIST="$FILES_BASE/*"

2
openstack/python-keystone/centos/files/password-rules.conf
View File

@ -18,7 +18,7 @@
# feature, values must be greater than 1. This feature depends on the `sql` # feature, values must be greater than 1. This feature depends on the `sql`
# backend for the `[identity] driver`. (integer value) # backend for the `[identity] driver`. (integer value)
# Minimum value: 1 # Minimum value: 1
unique_last_password_count = 2 unique_last_password_count = 3
# The regular expression used to validate password strength requirements. By # The regular expression used to validate password strength requirements. By
# default, the regular expression will match any password. The following is an # default, the regular expression will match any password. The following is an

5
openstack/python-keystone/centos/stx-keystone.dev_docker_image
View File

@ -4,4 +4,9 @@ PROJECT=keystone
PROJECT_REPO=https://opendev.org/openstack/keystone.git PROJECT_REPO=https://opendev.org/openstack/keystone.git
PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint" PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
PROFILES="fluent apache" 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

8
openstack/python-keystone/centos/stx-keystone.stable_docker_image
View File

@ -2,7 +2,11 @@ BUILDER=loci
LABEL=stx-keystone LABEL=stx-keystone
PROJECT=keystone PROJECT=keystone
PROJECT_REPO=https://opendev.org/openstack/keystone.git 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" PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
PROFILES="fluent apache" 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

1
openstack/python-neutron/centos/stx-neutron.dev_docker_image
View File

@ -5,4 +5,5 @@ 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

4
openstack/python-neutron/centos/stx-neutron.stable_docker_image
View File

@ -2,8 +2,8 @@ BUILDER=loci
LABEL=stx-neutron LABEL=stx-neutron
PROJECT=neutron PROJECT=neutron
PROJECT_REPO=https://opendev.org/openstack/neutron.git PROJECT_REPO=https://opendev.org/openstack/neutron.git
PROJECT_REF=stable/train 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

1
openstack/python-nova/centos/stx-nova.dev_docker_image
View File

@ -6,4 +6,5 @@ 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

4
openstack/python-nova/centos/stx-nova.stable_docker_image
View File

@ -2,9 +2,9 @@ BUILDER=loci
LABEL=stx-nova LABEL=stx-nova
PROJECT=nova PROJECT=nova
PROJECT_REPO=https://opendev.org/openstack/nova.git PROJECT_REPO=https://opendev.org/openstack/nova.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient" 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

2
openstack/python-openstackclient/centos/stx-openstackclient.dev_docker_image
View File

@ -7,3 +7,5 @@ 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

2
openstack/python-openstackclient/centos/stx-openstackclient.stable_docker_image
View File

@ -7,3 +7,5 @@ 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

2
openstack/python-openstackdocstheme/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

2
openstack/python-osc-lib/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

2
openstack/python-oslo-messaging/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT+1

5
openstack/python-placement/centos/stx-placement.dev_docker_image
View File

@ -4,4 +4,9 @@ PROJECT=placement
PROJECT_REPO=https://opendev.org/openstack/placement.git PROJECT_REPO=https://opendev.org/openstack/placement.git
PIP_PACKAGES="pycrypto httplib2 pylint" PIP_PACKAGES="pycrypto httplib2 pylint"
PROFILES="apache" 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

8
openstack/python-placement/centos/stx-placement.stable_docker_image
View File

@ -2,7 +2,11 @@ BUILDER=loci
LABEL=stx-placement LABEL=stx-placement
PROJECT=placement PROJECT=placement
PROJECT_REPO=https://opendev.org/openstack/placement.git PROJECT_REPO=https://opendev.org/openstack/placement.git
PROJECT_REF=stable/train PROJECT_REF=stable/ussuri
PIP_PACKAGES="pycrypto httplib2 pylint" PIP_PACKAGES="pycrypto httplib2 pylint"
PROFILES="apache" 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

2
openstack/python-wsme/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

2
openstack/rabbitmq-server/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT+5
BUILD_IS_SLOW=3 BUILD_IS_SLOW=3

12
releasenotes/source/conf.py
View File

@ -31,8 +31,10 @@ extensions = [
'reno.sphinxext', 'reno.sphinxext',
] ]
bug_project = '1027' # openstackdocstheme options
bug_tag = 'stx.bug' openstackdocs_repo_name = 'starlingx/upstream'
openstackdocs_use_storyboard = True
openstackdocs_auto_name = False
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
# templates_path = ['_templates'] # templates_path = ['_templates']
@ -82,7 +84,7 @@ exclude_patterns = []
# show_authors = False # show_authors = False
# The name of the Pygments (syntax highlighting) style to use. # 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. # A list of ignored prefixes for module index sorting.
# modindex_common_prefix = [] # modindex_common_prefix = []
@ -131,10 +133,6 @@ html_theme = 'starlingxdocs'
# directly to the root of the documentation. # directly to the root of the documentation.
# html_extra_path = [] # 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 # If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities. # typographically correct entities.
# html_use_smartypants = True # html_use_smartypants = True