diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-03 20:52:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-03 20:52:57 +0000 |
| commit | 59c881d85c4c9154a459c8c695f10243b387f047 (patch) | |
| tree | 6fc925e0a80b23154618db4118e3bd320177f107 /docker | |
| parent | 9420c991ad729a11c65169925aea6d6fd4c5372f (diff) | |
| parent | 7f85be51a0387cf7e3fad3e5bb4f6c9971230eee (diff) | |
| download | kolla-59c881d85c4c9154a459c8c695f10243b387f047.tar.gz kolla-59c881d85c4c9154a459c8c695f10243b387f047.zip | |
Merge "Added senlin-conductor and senlin-health-manager"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/senlin/senlin-conductor/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | docker/senlin/senlin-health-manager/Dockerfile.j2 | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/docker/senlin/senlin-conductor/Dockerfile.j2 b/docker/senlin/senlin-conductor/Dockerfile.j2 new file mode 100644 index 000000000..c88d622e7 --- /dev/null +++ b/docker/senlin/senlin-conductor/Dockerfile.j2 @@ -0,0 +1,23 @@ +FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block senlin_conductor_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_package_type == 'rpm' %} + {% set senlin_conductor_packages = ['openstack-senlin-conductor'] %} + + {% elif base_package_type == 'deb' %} + {% set senlin_conductor_packages = ['senlin-conductor'] %} + {% endif %} + +{{ macros.install_packages(senlin_conductor_packages | customizable("packages")) }} + +{% endif %} + +{% block senlin_conductor_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER senlin diff --git a/docker/senlin/senlin-health-manager/Dockerfile.j2 b/docker/senlin/senlin-health-manager/Dockerfile.j2 new file mode 100644 index 000000000..236e4dd04 --- /dev/null +++ b/docker/senlin/senlin-health-manager/Dockerfile.j2 @@ -0,0 +1,23 @@ +FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block senlin_health_manager_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_package_type == 'rpm' %} + {% set senlin_health_manager_packages = ['openstack-senlin-health-manager'] %} + + {% elif base_package_type == 'deb' %} + {% set senlin_health_manager_packages = ['senlin-health-manager'] %} + {% endif %} + +{{ macros.install_packages(senlin_health_manager_packages | customizable("packages")) }} + +{% endif %} + +{% block senlin_health_manager_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER senlin |