Add UPGRADE_PIP_PACKAGES parameter to Images

This change adds UPGRADE_PIP_PACKAGES=pip argument to
stx-openstack images. This change will be necessary
when the images start to be build with Antelope version.

This parameter (was introduced in [1]) was added only
on the images that were facing issues on dependencies
versions resolution. The images that will receive this
parameter are:

- stx-aodh
- stx-cinder
- stx-horizon

On this change we also change the images file from this
repo PIP_PACKAGES disposal for allow better reading of
each file dependencies. Even images that are getting
the UPGRADE_PIP_PACKAGES parameter.

It is important to notice that this change alone won't
allow the images to be build, as we still need changes
in the build tools dependencies.

[1] https://review.opendev.org/c/starlingx/root/+/870429

Test Plan:
PASS: Manually change the build-tools repo with the
      necessary upversions of constraints and locally
      build the images.
PASS: Notice the PIP dependencies being resolved

Story: 2010715
Task: 48429

Signed-off-by: Romulo Leite <romulo.leite@windriver.com>
Change-Id: I2b1b4a728575bd4ec939ddfd7ac7a9538182b8b1

upstream/openstack/openstack-aodh/debian/stx-aodh.stable_docker_image

@@ -3,10 +3,15 @@ LABEL=stx-aodh
 PROJECT=aodh
 PROJECT_REPO=https://opendev.org/openstack/aodh.git
 PROJECT_REF=stable/2023.1
+DIST_REPOS="OS"
+UPGRADE_PIP_PACKAGES=pip
 PROJECT_UID=42425
 PROJECT_GID=42425
-PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
+PIP_PACKAGES="\
-DIST_REPOS="OS"
+  aodhclient \
+  gnocchiclient \
+  SQLAlchemy \
+"
 PROFILES="apache"
 CUSTOMIZATION="\
     ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \

upstream/openstack/openstack-ironic/debian/stx-ironic.stable_docker_image

@@ -5,12 +5,24 @@ PROJECT_REPO=https://opendev.org/openstack/ironic.git
 PROJECT_REF=stable/2023.1
 PROJECT_UID=42425
 PROJECT_GID=42425
-PIP_PACKAGES="pylint alembic pysnmp"
 DIST_REPOS="OS"
-DIST_PACKAGES="ipxe tftpd-hpa openipmi ipmitool iproute2 qemu-utils syslinux-common open-iscsi"
+UPDATE_SYSTEM_ACCOUNT="yes"
+PIP_PACKAGES="\
+  alembic \
+  pysnmp
+"
+DIST_PACKAGES="\
+  ipmitool \
+  iproute2 \
+  ipxe \
+  open-iscsi \
+  openipmi \
+  qemu-utils \
+  syslinux-common \
+  tftpd-hpa
+"
 PROFILES="ironic apache"
 CUSTOMIZATION="\
     ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \
     ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf
 "
-UPDATE_SYSTEM_ACCOUNT="yes"

upstream/openstack/python-barbican/debian/stx-barbican.stable_docker_image

@@ -3,7 +3,7 @@ LABEL=stx-barbican
 PROJECT=barbican
 DIST_REPOS="OS"
 PROJECT_REPO=https://opendev.org/openstack/barbican.git
-NON_UNIQUE_SYSTEM_ACCOUNT="yes"
 PROJECT_REF=stable/2023.1
+NON_UNIQUE_SYSTEM_ACCOUNT="yes"
 PIP_PACKAGES="pycryptodomex"
 PROFILES="fluent"

upstream/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image

@@ -3,21 +3,21 @@ LABEL=stx-ceilometer
 PROJECT=ceilometer
 PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
 PROJECT_REF=stable/2023.1
+NON_UNIQUE_SYSTEM_ACCOUNT="yes"
+UPDATE_SYSTEM_ACCOUNT="yes"
+DIST_REPOS="OS"
 PIP_PACKAGES="\
   gnocchiclient \
   libvirt-python \
   panko==5.0.0
 "
-DIST_REPOS="OS"
 DIST_PACKAGES="\
-  ipmitool \
   libvirt0 \
   libvirt-clients \
   libvirt-daemon \
   libvirt-daemon-driver-lxc \
   libvirt-daemon-driver-qemu \
   libvirt-daemon-driver-storage-gluster \
-  libvirt-login-shell
+  libvirt-login-shell \
+  ipmitool 
 "
-UPDATE_SYSTEM_ACCOUNT="yes"
-NON_UNIQUE_SYSTEM_ACCOUNT="yes"

upstream/openstack/python-cinder/debian/stx-cinder.stable_docker_image

@@ -4,9 +4,13 @@ PROJECT=cinder
 DIST_REPOS="OS"
 PROJECT_REPO=https://opendev.org/openstack/cinder.git
 PROJECT_REF=stable/2023.1
+UPGRADE_PIP_PACKAGES=pip
 PROJECT_UID=42425
 PROJECT_GID=42425
 NON_UNIQUE_SYSTEM_ACCOUNT="yes"
 DIST_PACKAGES="nfs-common"
-PIP_PACKAGES="pycryptodomex python-swiftclient pylint"
+PIP_PACKAGES="\
+  pycryptodomex \
+  python-swiftclient
+"
 PROFILES="fluent cinder lvm ceph qemu"

upstream/openstack/python-glance/debian/stx-glance.stable_docker_image

@@ -6,6 +6,10 @@ PROJECT_REF=stable/2023.1
 DIST_REPOS="OS"
 UPDATE_SYSTEM_ACCOUNT="yes"
 NON_UNIQUE_SYSTEM_ACCOUNT="yes"
-PIP_PACKAGES="pycryptodomex python-swiftclient psutil pylint "
+PIP_PACKAGES="\
+  pycryptodomex \
+  python-swiftclient \
+  psutil
+"
 DIST_PACKAGES="libpq5"
 PROFILES="fluent glance ceph"

upstream/openstack/python-gnocchi/debian/stx-gnocchi.stable_docker_image

@@ -5,8 +5,16 @@ PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
 PROJECT_REF=4.3.2
 PROJECT_UID=42425
 PROJECT_GID=42425
-PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
 DIST_REPOS="OS"
+PIP_PACKAGES="\
+  gnocchiclient \
+  keystonemiddleware \
+  pymemcache \
+  psycopg2 \
+  oslo.db \
+  SQLAlchemy \
+  SQLAlchemy-Utils
+  "
 DIST_PACKAGES="python3-rados"
 PROFILES="gnocchi apache"
 CUSTOMIZATION="\

upstream/openstack/python-heat/openstack-heat/debian/stx-heat.stable_docker_image

@@ -5,6 +5,9 @@ PROJECT_REPO=https://opendev.org/openstack/heat.git
 PROJECT_REF=stable/2023.1
 DIST_REPOS="OS"
 NON_UNIQUE_SYSTEM_ACCOUNT="yes"
-PIP_PACKAGES="pycryptodomex pylint"
+PIP_PACKAGES="pycryptodomex"
-DIST_PACKAGES="curl libxslt1.1"
+DIST_PACKAGES="\
+  curl \
+  libxslt1.1
+"
 PROFILES="fluent heat apache"

upstream/openstack/python-horizon/debian/stx-horizon.stable_docker_image

@@ -3,11 +3,17 @@ LABEL=stx-horizon
 PROJECT=horizon
 PROJECT_REPO=https://opendev.org/openstack/horizon.git
 PROJECT_REF=stable/2023.1
+UPGRADE_PIP_PACKAGES=pip
+DIST_REPOS="OS"
 PROJECT_UID=42425
 PROJECT_GID=42425
-PIP_PACKAGES="pycryptodomex python-ceilometerclient \
+PIP_PACKAGES="\
-              coverage pyudev ldap"
+  coverage \
-DIST_REPOS="OS"
+  ldap \
+  pycryptodomex \
+  python-ceilometerclient \
+  pyudev
+"
 PROFILES="fluent horizon apache"
 CUSTOMIZATION="\
     ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \

upstream/openstack/python-keystone/debian/stx-keystone.stable_docker_image

@@ -3,7 +3,12 @@ LABEL=stx-keystone
 PROJECT=keystone
 PROJECT_REPO=https://opendev.org/openstack/keystone.git
 PROJECT_REF=stable/2023.1
-PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
+PIP_PACKAGES="\
+  ldap \
+  ldappool \
+  python-ldap \
+  python-openstackclient
+"
 DIST_REPOS="OS"
 PROFILES="fluent apache"
 CUSTOMIZATION="\

upstream/openstack/python-neutron/debian/stx-neutron.stable_docker_image

@@ -6,6 +6,11 @@ PROJECT_REPO=https://opendev.org/openstack/neutron.git
 PROJECT_REF=stable/2023.1
 UPDATE_SYSTEM_ACCOUNT="yes"
 NON_UNIQUE_SYSTEM_ACCOUNT="yes"
-PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
+PIP_PACKAGES="\
+  lxml \
+  networking-sfc \
+  pycrypto \
+  tinyrpc
+"
 DIST_PACKAGES="ethtool lshw"
 PROFILES="fluent neutron linuxbridge openvswitch"

upstream/openstack/python-openstackclient/debian/stx-openstackclient.stable_docker_image

@@ -3,8 +3,25 @@ LABEL=stx-openstackclients
 PROJECT=infra
 PROJECT_REPO=nil
 DIST_REPOS="OS"
-PIP_PACKAGES="pycryptodomex httplib2 pylint pyopenssl ndg-httpsclient pyasn1 \
+PIP_PACKAGES="\
-    python-ceilometerclient python-cinderclient python-glanceclient python-heatclient \
+  httplib2 \
-    python-keystoneclient python-neutronclient python-novaclient python-barbicanclient \
+  ndg-httpsclient \
-    python-swiftclient python-openstackclient"
+  pyasn1 \
-DIST_PACKAGES="python-dev libffi-dev openssl bash-completion"
+  pycryptodomex \
+  pyopenssl \
+  python-ceilometerclient \
+  python-cinderclient \
+  python-glanceclient \
+  python-heatclient \
+  python-keystoneclient \
+  python-neutronclient \
+  python-novaclient python-barbicanclient \
+  python-openstackclient \
+  python-swiftclient
+"
+DIST_PACKAGES="\
+  bash-completion \
+  libffi-dev \
+  openssl \
+  python-dev
+"