Stop using deprecated rpm package names

These packages produce a warning during the installation, we should
switch to their new names, usually to be specific about their use of
python2.

Change-Id: I0a80e822f64222d9a32aabd1fd834bcf794d6320

1 files changed, 24 insertions, 24 deletions

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index a2b761bbd..8948233a0 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -30,10 +30,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'libyaml',
             'MySQL-python',
             'openssl',
-            'pyOpenSSL',
+            'python2-pyOpenSSL',
             'pyparsing',
-            'python-crypto',
-            'python-msgpack',
+            'python2-crypto',
+            'python2-msgpack',
             'python2-cryptography',
             'python2-debtcollector',
             'python2-eventlet',
@@ -60,46 +60,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python2-PyMySQL',
             'python2-sysv_ipc',
             'python2-zake',
-            'python-alembic',
-            'python-amqp',
+            'python2-alembic',
+            'python2-amqp',
             'python-anyjson',
             'python-aodhclient',
             'python-barbicanclient',
             'python-beaker',
-            'python-cachetools',
-            'python-cffi',
-            'python-cliff',
+            'python2-cachetools',
+            'python2-cffi',
+            'python2-cliff',
             'python-cloudkittyclient',
             'python-cmd2',
             'python-congressclient',
             'python-contextlib2',
-            'python-dateutil',
+            'python2-dateutil',
             'python-decorator',
             'python-designateclient',
             'python-dogpile-cache',
             'python-editor',
             'python-elasticsearch',
             'python-enum34',
-            'python-extras',
-            'python-fixtures',
+            'python2-extras',
+            'python2-fixtures',
             'python-futures',
             'python-glanceclient',
             'python-gnocchiclient',
             'python-heatclient',
             'python-httplib2',
-            'python-idna',
+            'python2-idna',
             'python-inotify',
             'python-ipaddress',
             'python-ironicclient',
-            'python-jsonpatch',
-            'python-jsonpointer',
+            'python2-jsonpatch',
+            'python2-jsonpointer',
             'python-jsonschema',
             'python-kazoo',
             'python-keyring',
             'python-keystoneauth1',
             'python-keystoneclient',
             'python-keystonemiddleware',
-            'python-kombu',
+            'python2-kombu',
             'python-linecache2',
             'python-lxml',
             'python-magnumclient',
@@ -107,11 +107,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-manilaclient',
             'python-memcached',
             'python-migrate',
-            'python-mimeparse',
+            'python2-mimeparse',
             'python-mistralclient',
             'python-monotonic',
             'python-muranoclient',
-            'python-netaddr',
+            'python2-netaddr',
             'python-netifaces',
             'python-neutronclient',
             'python-novaclient',
@@ -128,26 +128,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-PyMySQL',
             'python-redis',
             'python-repoze-lru',
-            'python-requests',
+            'python2-requests',
             'python-retrying',
             'python-routes',
             'python-saharaclient',
-            'python-simplejson',
-            'python-sqlalchemy',
+            'python2-simplejson',
+            'python2-sqlalchemy',
             'python-sqlparse',
-            'python-stevedore',
+            'python2-stevedore',
             'python-swiftclient',
             'python-tempita',
             'python-testtools',
             'python-tooz',
-            'python-traceback2',
+            'python2-traceback2',
             'python-troveclient',
             'python-unicodecsv',
             'python-unittest2',
-            'python-urllib3',
+            'python2-urllib3',
             'python-vitrageclient',
             'python-warlock',
-            'python-webob',
+            'python2-webob',
             'python-wrapt',
             'python-zaqarclient',
             'PyYAML',