diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-10-11 15:46:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-11 15:46:14 +0000 |
| commit | f48763c1e66b32139612175582da64b8770aaab7 (patch) | |
| tree | 1890f98d46d512f240d809ca5641d9645caff494 | |
| parent | 7016dcf3539b45c8c560f9754a79e8d8d5558f36 (diff) | |
| parent | 83d0fc4a002e2c02359bf1bfc9b54bf15a6285fe (diff) | |
| download | kolla-f48763c1e66b32139612175582da64b8770aaab7.tar.gz kolla-f48763c1e66b32139612175582da64b8770aaab7.zip | |
Merge "Add certmonger container"
| -rw-r--r-- | docker/certmonger/Dockerfile.j2 | 21 | ||||
| -rwxr-xr-x | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/add-certmonger-0bf3a37089c5c267.yaml | 4 |
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. |