From 83d0fc4a002e2c02359bf1bfc9b54bf15a6285fe Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 11 Oct 2017 07:27:17 +0000
Subject: [PATCH] Add certmonger container

Certmonger is a daemon that handles the lifecycle of TLS certificates.
This adds a simple container with certmonger installed.

Change-Id: I94af686d73e5d58c2dc020f97edf69e165e26b73
---
 docker/certmonger/Dockerfile.j2               | 21 +++++++++++++++++++
 kolla/common/config.py                        |  1 +
 .../add-certmonger-0bf3a37089c5c267.yaml      |  4 ++++
 3 files changed, 26 insertions(+)
 create mode 100644 docker/certmonger/Dockerfile.j2
 create mode 100644 releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml

diff --git a/docker/certmonger/Dockerfile.j2 b/docker/certmonger/Dockerfile.j2
new file mode 100644
index 0000000000..ec260035f6
--- /dev/null
+++ b/docker/certmonger/Dockerfile.j2
@@ -0,0 +1,21 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block certmonger_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% set certmonger_packages = [
+            'certmonger',
+    ] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
+    {% 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 f57dfcfeb8..e12a7ad08b 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -57,6 +57,7 @@ _PROFILE_OPTS = [
     cfg.ListOpt('infra',
                 default=[
                     'ceph',
+                    'certmonger',
                     'cron',
                     'elasticsearch',
                     'etcd',
diff --git a/releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml b/releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml
new file mode 100644
index 0000000000..d1fd8452a1
--- /dev/null
+++ b/releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add certmonger image.