aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-01-15 20:11:36 +0000
committerGerrit Code Review <review@openstack.org>2021-01-15 20:11:36 +0000
commit695330c63049e20d9669a0818045ccc18102e338 (patch)
tree2a0c4160e2f1e7ae32e23325a5383d4c0060be13
parent8bf9e8a90ce94880c351e96634c82ce04f86d5b1 (diff)
parentec10282f51b00da665e6b52dc4ea984b8e9db17c (diff)
downloadkolla-695330c63049e20d9669a0818045ccc18102e338.tar.gz
kolla-695330c63049e20d9669a0818045ccc18102e338.zip
Merge "Remove certmonger image"
-rw-r--r--doc/source/matrix_aarch64.csv1
-rw-r--r--doc/source/matrix_x86.csv1
-rw-r--r--docker/certmonger/Dockerfile.j223
-rwxr-xr-xkolla/common/config.py1
-rw-r--r--releasenotes/notes/remove-certmonger-image-20f7049e4da91898.yaml3
5 files changed, 3 insertions, 26 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 8a0b22c74..948c1bf1f 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/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
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 3138323e2..728aa4131 100644
--- a/doc/source/matrix_x86.csv
+++ b/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
diff --git a/docker/certmonger/Dockerfile.j2 b/docker/certmonger/Dockerfile.j2
deleted file mode 100644
index 50b6ab947..000000000
--- a/docker/certmonger/Dockerfile.j2
+++ /dev/null
@@ -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 %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 8df0d9bbd..f0ff3b4e5 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -50,7 +50,6 @@ TARBALLS_BASE = "https://tarballs.opendev.org"
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=[
- 'certmonger',
'cron',
'elasticsearch',
'etcd',
diff --git a/releasenotes/notes/remove-certmonger-image-20f7049e4da91898.yaml b/releasenotes/notes/remove-certmonger-image-20f7049e4da91898.yaml
new file mode 100644
index 000000000..d7988fb77
--- /dev/null
+++ b/releasenotes/notes/remove-certmonger-image-20f7049e4da91898.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+ - The ``certmonger`` image is removed per the deprecation cycle.