openstack/kolla
Code Issues Proposed changes

Merge "Add support for installing binary packages for senlin"

Browse Source
This commit is contained in:
Zuul 2018-03-30 03:28:24 +00:00 committed by Gerrit Code Review
commit e847681e5c
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/senlin/senlin-api/Dockerfile.j2
View File

@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block senlin_api_header %}{% endblock %}
{% if install_type == 'binary' %}
{% import "macros.j2" as macros with context %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% 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 %}
{{ macros.install_packages(senlin_api_packages | customizable("packages")) }}
{% endif %}

9
docker/senlin/senlin-base/Dockerfile.j2
View File

@ -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' %}

13
docker/senlin/senlin-engine/Dockerfile.j2
View File

@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block senlin_engine_header %}{% endblock %}
{% if install_type == 'binary' %}
{% import "macros.j2" as macros with context %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% 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 %}
{{ macros.install_packages(senlin_engine_packages | customizable("packages")) }}
{% endif %}

4
kolla/image/build.py
View File

@ -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"