diff options
| -rw-r--r-- | docker/senlin/senlin-api/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/senlin/senlin-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/senlin/senlin-engine/Dockerfile.j2 | 11 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
4 files changed, 25 insertions, 10 deletions
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index 969197ac5..ebc1453c7 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block senlin_api_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set senlin_api_packages = ['openstack-senlin-api'] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set senlin_api_packages = ['senlin-api'] %} + {% endif %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false +{{ macros.install_packages(senlin_api_packages | customizable("packages")) }} {% endif %} diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index e2d2c1c59..46f9797d6 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -8,9 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='senlin') }} {% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set senlin_base_packages = ['openstack-senlin-common'] %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set senlin_base_packages = ['senlin-common'] %} + {% endif %} + +{{ macros.install_packages(senlin_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 40a08ba05..a31a04146 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block senlin_engine_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set senlin_engine_packages = ['openstack-senlin-engine'] %} + + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set senlin_engine_packages = ['senlin-engine'] %} + {% endif %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false +{{ macros.install_packages(senlin_engine_packages | customizable("packages")) }} {% endif %} diff --git a/kolla/image/build.py b/kolla/image/build.py index b1bc718d3..356b476bc 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -90,7 +90,6 @@ SKIPPED_IMAGES = { "nova-mksproxy", "ovsdpdk", "searchlight-base", - "senlin-base", "solum-base", "vmtp", "zun-base", @@ -120,7 +119,6 @@ SKIPPED_IMAGES = { "novajoin-base", "octavia-base", "searchlight-base", - "senlin-base", "solum-base", "tacker-base", "tripleo-ui", @@ -151,7 +149,6 @@ SKIPPED_IMAGES = { "novajoin-base", "octavia-base", "searchlight-base", - "senlin-base", "sensu-base", "solum-base", "tacker-base", @@ -178,7 +175,6 @@ SKIPPED_IMAGES = { "neutron-bgp-dragent", "ovsdpdk", "searchlight-base", - "senlin-base", "solum-base", "vmtp", "zun-base" |