summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-13 11:53:31 +0000
committerGerrit Code Review <review@openstack.org>2018-07-13 11:53:31 +0000
commit74612346b0a76978c2ff0dabef564ac64880e64b (patch)
treebf1555e32e50cdca45dd5c48f53ba9f96db9bcd2
parent3d273521817ef19191332cf80274174f4c978701 (diff)
parent5951977eab3865eace96857df52914f41bd90146 (diff)
Merge "Stop using deprecated rpm package names"
-rw-r--r--docker/aodh/aodh-base/Dockerfile.j24
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j22
-rw-r--r--docker/glance/glance-api/Dockerfile.j22
-rw-r--r--docker/gnocchi/gnocchi-base/Dockerfile.j24
-rw-r--r--docker/helm-repository/Dockerfile.j22
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j24
-rw-r--r--docker/keystone/keystone-base/Dockerfile.j24
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j24
-rw-r--r--docker/nova/nova-compute/Dockerfile.j22
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j22
-rw-r--r--docker/openstack-base/Dockerfile.j248
-rw-r--r--docker/panko/panko-base/Dockerfile.j24
-rw-r--r--docker/telegraf/Dockerfile.j27
-rw-r--r--docker/vitrage/vitrage-api/Dockerfile.j22
-rw-r--r--docker/vitrage/vitrage-base/Dockerfile.j22
-rw-r--r--docker/zun/zun-base/Dockerfile.j22
16 files changed, 48 insertions, 47 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index 74cc21e..392b75e 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 'mod_ssl', 15 'mod_ssl',
16 'mod_wsgi', 16 'mod_wsgi',
17 'openstack-aodh-common', 17 'openstack-aodh-common',
18 'python-ldappool' 18 'python2-ldappool'
19 ] %} 19 ] %}
20 20
21{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} 21{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
@@ -45,7 +45,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
45 'httpd', 45 'httpd',
46 'mod_wsgi', 46 'mod_wsgi',
47 'mod_ssl', 47 'mod_ssl',
48 'python-ldappool' 48 'python2-ldappool'
49 ] %} 49 ] %}
50 50
51{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} 51{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 2fbf24b..8fb1bc5 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -34,7 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
34 'ceph-common', 34 'ceph-common',
35 'lvm2', 35 'lvm2',
36 'cryptsetup', 36 'cryptsetup',
37 'qemu-img' 37 'qemu-img-ev'
38 ] %} 38 ] %}
39 {% elif base_distro in ['debian', 'ubuntu'] %} 39 {% elif base_distro in ['debian', 'ubuntu'] %}
40 {% set cinder_base_packages = [ 40 {% set cinder_base_packages = [
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 9dcb42c..23ec04d 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6{% import "macros.j2" as macros with context %} 6{% import "macros.j2" as macros with context %}
7 7
8{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 8{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
9 {% set glance_api_packages = ['qemu-img'] %} 9 {% set glance_api_packages = ['qemu-img-ev'] %}
10{% elif base_distro in ['debian', 'ubuntu'] %} 10{% elif base_distro in ['debian', 'ubuntu'] %}
11 {% set glance_api_packages = ['qemu-utils'] %} 11 {% set glance_api_packages = ['qemu-utils'] %}
12{% endif %} 12{% endif %}
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 563828e..52662db 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 'mod_ssl', 15 'mod_ssl',
16 'mod_wsgi', 16 'mod_wsgi',
17 'openstack-gnocchi-common', 17 'openstack-gnocchi-common',
18 'python-ldappool', 18 'python2-ldappool',
19 'python2-cradox' 19 'python2-cradox'
20 ] %} 20 ] %}
21 21
@@ -52,7 +52,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
52 'librados2-devel', 52 'librados2-devel',
53 'mod_ssl', 53 'mod_ssl',
54 'mod_wsgi', 54 'mod_wsgi',
55 'python-ldappool' 55 'python2-ldappool'
56 ] %} 56 ] %}
57 57
58 # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le 58 # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2
index dfb2ebd..45772bc 100644
--- a/docker/helm-repository/Dockerfile.j2
+++ b/docker/helm-repository/Dockerfile.j2
@@ -17,7 +17,7 @@ ENV helm_version=2.3.0 \
17 {% set helm_repo_packages = [ 17 {% set helm_repo_packages = [
18 'git', 18 'git',
19 'jq', 19 'jq',
20 'python-pip' 20 'python2-pip'
21 ] %} 21 ] %}
22 22
23{% elif base_distro in ['debian', 'ubuntu'] %} 23{% elif base_distro in ['debian', 'ubuntu'] %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 470e8ab..9a658fc 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
25 'python-scciclient', 25 'python-scciclient',
26 'python-sushy', 26 'python-sushy',
27 'python-UcsSdk', 27 'python-UcsSdk',
28 'qemu-img', 28 'qemu-img-ev',
29 'shellinabox', 29 'shellinabox',
30 'systemd-python', 30 'systemd-python',
31 'util-linux', 31 'util-linux',
@@ -64,7 +64,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
64 'ipmitool', 64 'ipmitool',
65 'parted', 65 'parted',
66 'psmisc', 66 'psmisc',
67 'qemu-img', 67 'qemu-img-ev',
68 'shellinabox', 68 'shellinabox',
69 'util-linux', 69 'util-linux',
70 'xfsprogs', 70 'xfsprogs',
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 9d65a3c..1c0bad8 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
16 'mod_ssl', 16 'mod_ssl',
17 'mod_wsgi', 17 'mod_wsgi',
18 'openstack-keystone', 18 'openstack-keystone',
19 'python-ldappool', 19 'python2-ldappool',
20 'python-keystoneclient' 20 'python-keystoneclient'
21 ] %} 21 ] %}
22 22
@@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
53 'mod_auth_openidc', 53 'mod_auth_openidc',
54 'mod_ssl', 54 'mod_ssl',
55 'mod_wsgi', 55 'mod_wsgi',
56 'python-ldappool' 56 'python2-ldappool'
57 ] %} 57 ] %}
58{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} 58{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
59RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 59RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 9a2c2b3..13be3a9 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
25 'openvswitch', 25 'openvswitch',
26 'python-networking-sfc', 26 'python-networking-sfc',
27 'python-networking-vmware-nsx', 27 'python-networking-vmware-nsx',
28 'python-openvswitch', 28 'python2-openvswitch',
29 'python2-oslo-vmware' 29 'python2-oslo-vmware'
30 ] %} 30 ] %}
31 31
@@ -88,7 +88,7 @@ RUN mkdir -p /usr/share/neutron \
88 'keepalived', 88 'keepalived',
89 'net-tools', 89 'net-tools',
90 'openvswitch', 90 'openvswitch',
91 'python-openvswitch', 91 'python2-openvswitch',
92 'radvd', 92 'radvd',
93 'uuid' 93 'uuid'
94 ] %} 94 ] %}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 6138fc3..bc84b42 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -78,7 +78,7 @@ RUN rm -f /etc/nova/nova-compute.conf
78 'parted', 78 'parted',
79 'python-libguestfs', 79 'python-libguestfs',
80 'python-rtslib', 80 'python-rtslib',
81 'qemu-img', 81 'qemu-img-ev',
82 'sysfsutils', 82 'sysfsutils',
83 'targetcli' 83 'targetcli'
84 ] %} 84 ] %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 49ab792..f5de278 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
19 'libvirt-daemon-driver-lxc', 19 'libvirt-daemon-driver-lxc',
20 'libvirt-daemon-driver-nwfilter', 20 'libvirt-daemon-driver-nwfilter',
21 'openvswitch', 21 'openvswitch',
22 'qemu-kvm' 22 'qemu-kvm-ev'
23 ] %} 23 ] %}
24 24
25{% elif base_distro in ['debian', 'ubuntu'] %} 25{% elif base_distro in ['debian', 'ubuntu'] %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index a2b761b..8948233 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
30 'libyaml', 30 'libyaml',
31 'MySQL-python', 31 'MySQL-python',
32 'openssl', 32 'openssl',
33 'pyOpenSSL', 33 'python2-pyOpenSSL',
34 'pyparsing', 34 'pyparsing',
35 'python-crypto', 35 'python2-crypto',
36 'python-msgpack', 36 'python2-msgpack',
37 'python2-cryptography', 37 'python2-cryptography',
38 'python2-debtcollector', 38 'python2-debtcollector',
39 'python2-eventlet', 39 'python2-eventlet',
@@ -60,46 +60,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
60 'python2-PyMySQL', 60 'python2-PyMySQL',
61 'python2-sysv_ipc', 61 'python2-sysv_ipc',
62 'python2-zake', 62 'python2-zake',
63 'python-alembic', 63 'python2-alembic',
64 'python-amqp', 64 'python2-amqp',
65 'python-anyjson', 65 'python-anyjson',
66 'python-aodhclient', 66 'python-aodhclient',
67 'python-barbicanclient', 67 'python-barbicanclient',
68 'python-beaker', 68 'python-beaker',
69 'python-cachetools', 69 'python2-cachetools',
70 'python-cffi', 70 'python2-cffi',
71 'python-cliff', 71 'python2-cliff',
72 'python-cloudkittyclient', 72 'python-cloudkittyclient',
73 'python-cmd2', 73 'python-cmd2',
74 'python-congressclient', 74 'python-congressclient',
75 'python-contextlib2', 75 'python-contextlib2',
76 'python-dateutil', 76 'python2-dateutil',
77 'python-decorator', 77 'python-decorator',
78 'python-designateclient', 78 'python-designateclient',
79 'python-dogpile-cache', 79 'python-dogpile-cache',
80 'python-editor', 80 'python-editor',
81 'python-elasticsearch', 81 'python-elasticsearch',
82 'python-enum34', 82 'python-enum34',
83 'python-extras', 83 'python2-extras',
84 'python-fixtures', 84 'python2-fixtures',
85 'python-futures', 85 'python-futures',
86 'python-glanceclient', 86 'python-glanceclient',
87 'python-gnocchiclient', 87 'python-gnocchiclient',
88 'python-heatclient', 88 'python-heatclient',
89 'python-httplib2', 89 'python-httplib2',
90 'python-idna', 90 'python2-idna',
91 'python-inotify', 91 'python-inotify',
92 'python-ipaddress', 92 'python-ipaddress',
93 'python-ironicclient', 93 'python-ironicclient',
94 'python-jsonpatch', 94 'python2-jsonpatch',
95 'python-jsonpointer', 95 'python2-jsonpointer',
96 'python-jsonschema', 96 'python-jsonschema',
97 'python-kazoo', 97 'python-kazoo',
98 'python-keyring', 98 'python-keyring',
99 'python-keystoneauth1', 99 'python-keystoneauth1',
100 'python-keystoneclient', 100 'python-keystoneclient',
101 'python-keystonemiddleware', 101 'python-keystonemiddleware',
102 'python-kombu', 102 'python2-kombu',
103 'python-linecache2', 103 'python-linecache2',
104 'python-lxml', 104 'python-lxml',
105 'python-magnumclient', 105 'python-magnumclient',
@@ -107,11 +107,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
107 'python-manilaclient', 107 'python-manilaclient',
108 'python-memcached', 108 'python-memcached',
109 'python-migrate', 109 'python-migrate',
110 'python-mimeparse', 110 'python2-mimeparse',
111 'python-mistralclient', 111 'python-mistralclient',
112 'python-monotonic', 112 'python-monotonic',
113 'python-muranoclient', 113 'python-muranoclient',
114 'python-netaddr', 114 'python2-netaddr',
115 'python-netifaces', 115 'python-netifaces',
116 'python-neutronclient', 116 'python-neutronclient',
117 'python-novaclient', 117 'python-novaclient',
@@ -128,26 +128,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
128 'python-PyMySQL', 128 'python-PyMySQL',
129 'python-redis', 129 'python-redis',
130 'python-repoze-lru', 130 'python-repoze-lru',
131 'python-requests', 131 'python2-requests',
132 'python-retrying', 132 'python-retrying',
133 'python-routes', 133 'python-routes',
134 'python-saharaclient', 134 'python-saharaclient',
135 'python-simplejson', 135 'python2-simplejson',
136 'python-sqlalchemy', 136 'python2-sqlalchemy',
137 'python-sqlparse', 137 'python-sqlparse',
138 'python-stevedore', 138 'python2-stevedore',
139 'python-swiftclient', 139 'python-swiftclient',
140 'python-tempita', 140 'python-tempita',
141 'python-testtools', 141 'python-testtools',
142 'python-tooz', 142 'python-tooz',
143 'python-traceback2', 143 'python2-traceback2',
144 'python-troveclient', 144 'python-troveclient',
145 'python-unicodecsv', 145 'python-unicodecsv',
146 'python-unittest2', 146 'python-unittest2',
147 'python-urllib3', 147 'python2-urllib3',
148 'python-vitrageclient', 148 'python-vitrageclient',
149 'python-warlock', 149 'python-warlock',
150 'python-webob', 150 'python2-webob',
151 'python-wrapt', 151 'python-wrapt',
152 'python-zaqarclient', 152 'python-zaqarclient',
153 'PyYAML', 153 'PyYAML',
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2
index 1623bf6..7d5ac90 100644
--- a/docker/panko/panko-base/Dockerfile.j2
+++ b/docker/panko/panko-base/Dockerfile.j2
@@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 'mod_ssl', 15 'mod_ssl',
16 'mod_wsgi', 16 'mod_wsgi',
17 'openstack-panko-common', 17 'openstack-panko-common',
18 'python-ldappool' 18 'python2-ldappool'
19 ] %} 19 ] %}
20 20
21{{ macros.install_packages(panko_base_packages | customizable("packages")) }} 21{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
@@ -36,7 +36,7 @@ RUN echo > /etc/apache2/ports.conf
36 'httpd', 36 'httpd',
37 'mod_ssl', 37 'mod_ssl',
38 'mod_wsgi', 38 'mod_wsgi',
39 'python-ldappool' 39 'python2-ldappool'
40 ] %} 40 ] %}
41{{ macros.install_packages(panko_base_packages | customizable("packages")) }} 41{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
42RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 42RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
index c228480..b43f9fe 100644
--- a/docker/telegraf/Dockerfile.j2
+++ b/docker/telegraf/Dockerfile.j2
@@ -10,17 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
10{% set telegraf_packages = [ 10{% set telegraf_packages = [
11 'chrony', 11 'chrony',
12 'net-tools', 12 'net-tools',
13 'python-pip',
14 'telegraf' 13 'telegraf'
15] %} 14] %}
16 15
17{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 16{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
18 {% set telegraf_packages = telegraf_packages + [ 17 {% set telegraf_packages = telegraf_packages + [
19 'collectd' 18 'collectd',
19 'python2-pip'
20 ] %} 20 ] %}
21{% elif base_distro in ['debian', 'ubuntu'] %} 21{% elif base_distro in ['debian', 'ubuntu'] %}
22 {% set telegraf_packages = telegraf_packages + [ 22 {% set telegraf_packages = telegraf_packages + [
23 'collectd-core' 23 'collectd-core',
24 'python-pip'
24 ] %} 25 ] %}
25{% endif %} 26{% endif %}
26 27
diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2
index 5a9cae2..1d486e8 100644
--- a/docker/vitrage/vitrage-api/Dockerfile.j2
+++ b/docker/vitrage/vitrage-api/Dockerfile.j2
@@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
13 'httpd', 13 'httpd',
14 'mod_wsgi', 14 'mod_wsgi',
15 'mod_ssl', 15 'mod_ssl',
16 'python-ldappool', 16 'python2-ldappool',
17 'openstack-vitrage-api' 17 'openstack-vitrage-api'
18 ] %} 18 ] %}
19 19
diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2
index 9d3aba6..f53bfb5 100644
--- a/docker/vitrage/vitrage-base/Dockerfile.j2
+++ b/docker/vitrage/vitrage-base/Dockerfile.j2
@@ -32,7 +32,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
32 'httpd', 32 'httpd',
33 'mod_wsgi', 33 'mod_wsgi',
34 'mod_ssl', 34 'mod_ssl',
35 'python-ldappool' 35 'python2-ldappool'
36 ] %} 36 ] %}
37 37
38{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} 38{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
index 2fbff31..9f502ae 100644
--- a/docker/zun/zun-base/Dockerfile.j2
+++ b/docker/zun/zun-base/Dockerfile.j2
@@ -20,7 +20,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
20 'httpd', 20 'httpd',
21 'mod_wsgi', 21 'mod_wsgi',
22 'mod_ssl', 22 'mod_ssl',
23 'python-ldappool' 23 'python2-ldappool'
24 ] %} 24 ] %}
25 25
26{{ macros.install_packages(zun_base_packages | customizable("packages")) }} 26{{ macros.install_packages(zun_base_packages | customizable("packages")) }}