aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-10-11 07:27:17 +0000
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-10-11 09:24:04 +0000
commit83d0fc4a002e2c02359bf1bfc9b54bf15a6285fe (patch)
tree746ea953b991f7e94b365b84e180b3261b55722b
parent2564b6aecdb4c582a7a25642596734a586a3e385 (diff)
downloadkolla-83d0fc4a002e2c02359bf1bfc9b54bf15a6285fe.tar.gz
kolla-83d0fc4a002e2c02359bf1bfc9b54bf15a6285fe.zip
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
-rw-r--r--docker/certmonger/Dockerfile.j221
-rwxr-xr-xkolla/common/config.py1
-rw-r--r--releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml4
3 files changed, 26 insertions, 0 deletions
diff --git a/docker/certmonger/Dockerfile.j2 b/docker/certmonger/Dockerfile.j2
new file mode 100644
index 000000000..ec260035f
--- /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 f57dfcfeb..e12a7ad08 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 000000000..d1fd8452a
--- /dev/null
+++ b/releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ Add certmonger image.