diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-09 11:12:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-09 11:12:07 +0000 |
| commit | 3a1d525f3dc45fc3f231a21570b1f5ec0e430c90 (patch) | |
| tree | 9c03a4ec35b6bc1094b8f7021415e870dc5a1f7f | |
| parent | 5841abe910c50d34fbbf4dcfde7b6e92dd82bdae (diff) | |
| parent | 8d76b269c2a48e14f8666c451bf0037100a679d4 (diff) | |
| download | kolla-3a1d525f3dc45fc3f231a21570b1f5ec0e430c90.tar.gz kolla-3a1d525f3dc45fc3f231a21570b1f5ec0e430c90.zip | |
Merge "Add tacker binary for rpm based distros"
| -rw-r--r-- | docker/tacker/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | releasenotes/notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml | 3 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/docker/tacker/Dockerfile.j2 b/docker/tacker/Dockerfile.j2 index 8110cc08e..f549e8d0a 100644 --- a/docker/tacker/Dockerfile.j2 +++ b/docker/tacker/Dockerfile.j2 @@ -9,8 +9,19 @@ 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 + && /bin/false + + {% endif %} + +{{ macros.install_packages(tacker_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/releasenotes/notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml b/releasenotes/notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml new file mode 100644 index 000000000..30acf7629 --- /dev/null +++ b/releasenotes/notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml @@ -0,0 +1,3 @@ +--- +features: + - Tacker images support binary build from rpm based distros. diff --git a/tests/test_build.py b/tests/test_build.py index ebbee7880..47d7ed757 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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", |