Merge "Remove certmonger image"

doc/source/matrix_aarch64.csv

@@ -5,7 +5,6 @@ barbican,C,C,C,C,N,C
 bifrost,N,C,N,N,N,N
 blazar,N,C,N,C,N,C
 ceilometer,C,C,C,C,N,C
-certmonger (deprecated),C,C,C,C,N,C
 chrony,C,C,C,C,N,C
 cinder,C,C,C,C,N,C
 cloudkitty,C,C,N,C,N,C

doc/source/matrix_x86.csv

@@ -5,7 +5,6 @@ barbican,C,T,C,C,C,C
 bifrost,N,T,N,C,N,N
 blazar,N,C,N,C,N,C
 ceilometer,C,C,C,C,C,C
-certmonger (deprecated),C,C,C,C,C,C
 chrony,T,T,T,T,C,T
 cinder,C,T,C,T,C,C
 cloudkitty,C,C,N,C,N,C

docker/certmonger/Dockerfile.j2

@@ -1,23 +0,0 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block certmonger_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set certmonger_packages = [
-            'certmonger',
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set certmonger_packages = [
-            'certmonger'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(certmonger_packages | customizable("packages")) }}
-
-{% block certmonger_footer %}{% endblock %}
-{% block footer %}{% endblock %}

kolla/common/config.py

@@ -50,7 +50,6 @@ TARBALLS_BASE = "https://tarballs.opendev.org"
 _PROFILE_OPTS = [
     cfg.ListOpt('infra',
                 default=[
-                    'certmonger',
                     'cron',
                     'elasticsearch',
                     'etcd',

releasenotes/notes/remove-certmonger-image-20f7049e4da91898.yaml

@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``certmonger`` image is removed per the deprecation cycle.