Merge "Add tacker binary for rpm based distros"

This commit is contained in:
Jenkins 2017-05-09 11:12:07 +00:00 committed by Gerrit Code Review
commit 3a1d525f3d
3 changed files with 15 additions and 3 deletions

View File

@ -9,9 +9,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set tacker_packages = [
'openstack-tacker'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{{ macros.install_packages(tacker_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD tacker-archive /tacker-source

View File

@ -0,0 +1,3 @@
---
features:
- Tacker images support binary build from rpm based distros.

View File

@ -85,7 +85,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"solum-base",
"tacker",
"vitrage-base",
"vmtp",
"zun-base",
@ -207,7 +206,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
"searchlight-base",
"senlin-base",
"solum-base",
"tacker",
"vitrage-base",
"vmtp",
"zun-base",