From 8d76b269c2a48e14f8666c451bf0037100a679d4 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Thu, 6 Apr 2017 13:08:22 +0100
Subject: [PATCH] Add tacker binary for rpm based distros

Tacker rpm is present in RDO repositories.
Now images can be built for binary installations.

Change-Id: I50203644ae0cc61fe87f2c7af11ff6ea3ef6df8d
---
 docker/tacker/Dockerfile.j2                         | 13 ++++++++++++-
 .../notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml   |  3 +++
 tests/test_build.py                                 |  2 --
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/tacker-rpm-binary-137dc2771bdfc5d3.yaml

diff --git a/docker/tacker/Dockerfile.j2 b/docker/tacker/Dockerfile.j2
index e77264a738..3271e1212a 100644
--- a/docker/tacker/Dockerfile.j2
+++ b/docker/tacker/Dockerfile.j2
@@ -9,8 +9,19 @@ MAINTAINER {{ maintainer }}
 
 {% 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 0000000000..30acf7629c
--- /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 01a9dedce7..5b0fce1ad3 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",
@@ -204,7 +203,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
         "searchlight-base",
         "senlin-base",
         "solum-base",
-        "tacker",
         "vitrage-base",
         "vmtp",
         "zun-base",