diff options
| author | Alex Schultz <aschultz@redhat.com> | 2019-01-21 12:58:19 -0700 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-03-12 17:48:18 +0000 |
| commit | 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 (patch) | |
| tree | 25de124db6ae7848cecb121ac414eb468bfd4d5c /docker/openstack-base | |
| parent | 8df6eb01184672ffdc752437ea4d98d13f16026e (diff) | |
| download | kolla-3e5d8e2653db1c6c28cb428f81cd0bc332c623c3.tar.gz kolla-3e5d8e2653db1c6c28cb428f81cd0bc332c623c3.zip | |
Add python3 packages for RHEL systems
RDO is currently working on python3 support for the next version of
CentOS/RHEL based systems. This package uses the distro_python3 flag
that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to
use the python3 specific package names. This change only adds python3
package names for RHEL systems.
Conflicts-With: https://review.openstack.org/#/c/636457/
Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a
Related-Blueprint: python3-support
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 91 |
1 files changed, 87 insertions, 4 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 4f6627197..493cbd8ce 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -15,8 +15,92 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libxslt', 'libyaml', 'mailcap', - 'MySQL-python', 'openssl', + 'systemd-sysv', + 'tcp_wrappers-libs' + ] %} + {% if distro_python_version.startswith('3') %} + {% set openstack_base_packages = openstack_base_packages + [ + 'procps-ng', + 'python3-PyYAML', + 'python3-alembic', + 'python3-anyjson', + 'python3-aodhclient', + 'python3-barbicanclient', + 'python3-cachetools', + 'python3-cloudkittyclient', + 'python3-congressclient', + 'python3-contextlib2', + 'python3-cryptography', + 'python3-designateclient', + 'python3-elasticsearch', + 'python3-eventlet', + 'python3-extras', + 'python3-glanceclient', + 'python3-gnocchiclient', + 'python3-heatclient', + 'python3-httplib2', + 'python3-ironicclient', + 'python3-iso8601', + 'python3-kazoo', + 'python3-keystoneauth1', + 'python3-keystoneclient', + 'python3-keystonemiddleware', + 'python3-logutils', + 'python3-lxml', + 'python3-magnumclient', + 'python3-manilaclient', + 'python3-migrate', + 'python3-mimeparse', + 'python3-mistralclient', + 'python3-muranoclient', + 'python3-mysql', + 'python3-neutronclient', + 'python3-novaclient', + 'python3-openstackclient', + 'python3-oslo-cache', + 'python3-oslo-concurrency', + 'python3-oslo-config', + 'python3-oslo-context', + 'python3-oslo-db', + 'python3-oslo-i18n', + 'python3-oslo-log', + 'python3-oslo-messaging', + 'python3-oslo-middleware', + 'python3-oslo-policy', + 'python3-oslo-reports', + 'python3-oslo-rootwrap', + 'python3-oslo-serialization', + 'python3-oslo-service', + 'python3-oslo-utils', + 'python3-oslo-versionedobjects', + 'python3-osprofiler', + 'python3-paramiko', + 'python3-paste-deploy', + 'python3-pbr', + 'python3-pika', + 'python3-posix_ipc', + 'python3-prettytable', + 'python3-psycopg2', + 'python3-pyasn1', + 'python3-redis', + 'python3-retrying', + 'python3-routes', + 'python3-saharaclient', + 'python3-sqlalchemy', + 'python3-sqlparse', + 'python3-swiftclient', + 'python3-sysv_ipc', + 'python3-tooz', + 'python3-troveclient', + 'python3-vitrageclient', + 'python3-webob', + 'python3-zaqarclient', + 'util-linux-user' + ] %} + {% else %} + {% set openstack_base_packages = openstack_base_packages + [ + 'MySQL-python', 'python2-cryptography', 'python2-eventlet', 'python2-iso8601', @@ -91,10 +175,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python2-webob', 'python-zaqarclient', 'PyYAML', - 'systemd-sysv', - 'sysvinit-tools', - 'tcp_wrappers-libs' + 'sysvinit-tools' ] %} + {% endif %} {% elif base_package_type == 'deb' %} |