From d78144fbdbcdd10829214452a27097cc7ec760c6 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 18 Jan 2019 08:50:30 -0700
Subject: [PATCH] Fix magnum logic for rhel

RHEL currently doesn't support magnum, so let's throw an error if it is
built on rhel.

Change-Id: Idfb94fd66e5eb841fb81ec4eeeaf13b7c5a3cede
---
 docker/magnum/magnum-api/Dockerfile.j2       | 5 ++++-
 docker/magnum/magnum-base/Dockerfile.j2      | 5 ++++-
 docker/magnum/magnum-conductor/Dockerfile.j2 | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index a16bfe5396..2a7f78cceb 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
@@ -6,8 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
+    {% if base_package_type == 'rpm' and base_distro != 'rhel' %}
        {% set magnum_api_packages = ['openstack-magnum-api'] %}
+    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
     {% elif base_package_type == 'deb' %}
        {% set magnum_api_packages = ['magnum-api'] %}
     {% endif %}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 9ae597a29f..063db926e4 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -8,8 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='magnum') }}
 
 {% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
+    {% if base_package_type == 'rpm' and base_distro != 'rhel' %}
        {% set magnum_base_packages = ['openstack-magnum-common'] %}
+    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/bash
     {% elif base_package_type == 'deb' %}
        {% set magnum_base_packages = ['magnum-common'] %}
     {% endif %}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index 7946256cd7..c06bac11aa 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -6,11 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
+    {% if base_package_type == 'rpm' and base_distro != 'rhel' %}
         {% set magnum_conductor_packages = [
              'openstack-magnum-conductor'
          ] %}
-
+    {% elif base_package_type == 'rpm' and base_distro == 'rhel' %}
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
     {% elif base_package_type == 'deb' %}
         {% set magnum_conductor_packages = [
              'magnum-conductor'