diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-09 17:44:54 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-15 09:32:06 +0000 |
| commit | 53443c5c712f4ec23b859105e94bcd90abc27762 (patch) | |
| tree | 5bc6d8db4c65519e16d231b55f574e813e29da4b /docker/monasca | |
| parent | a176c6e080be2e71829e8ca5e8b330fdda70038a (diff) | |
| download | kolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip | |
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.
We also no longer have to support yum as a value for
distro_package_manager.
Partially-Implements: blueprint centos-rhel-8
Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index fbe6da457..e4ccf449f 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -20,12 +20,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set monasca_base_packages = [ 'httpd', 'mod_ssl', + 'python3-mod_wsgi', ] %} - {% if distro_python_version.startswith('3') %} - {% set monasca_base_packages = monasca_base_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set monasca_base_packages = monasca_base_packages + ['mod_wsgi'] %} - {% endif %} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index e04bb2bb8..870f8e374 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -50,12 +50,10 @@ ARG monasca_grafana_version=grafana4_2 ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz {% block monasca_grafana_install %} -# NOTE(mgoddard): Pinning rake because rake 13.0.0 depends on Ruby 2.2, and CentOS 7 only provides -# Ruby 2.0. # NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing. # NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH. # This is forced for all distros to avoid conflicts with native packages. -RUN gem install rake:"~>12" fpm \ +RUN gem install fpm \ && curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \ && mkdir -p ${monasca_grafana_build_path} \ && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \ |