From 9d0c89a76c756c48af3e35f0c804cc12489d0f4b Mon Sep 17 00:00:00 2001
From: Tyler Smith <tyler.smith@windriver.com>
Date: Wed, 15 May 2019 11:49:45 -0400
Subject: [PATCH] Removing horizon-region-exclusion support

This functionality is no longer supported with vanilla
horizon so this config file is being removed.

Change-Id: I15896eba1403a89aa0cdfa7f4df6c4c04baf9752
Story: 2004520
Task: 30987
Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
---
 .../centos/files/horizon-region-exclusions.csv       | 12 ------------
 openstack/python-horizon/centos/files/horizon.init   |  9 ---------
 .../python-horizon/centos/python-django-horizon.spec |  3 ---
 3 files changed, 24 deletions(-)
 delete mode 100755 openstack/python-horizon/centos/files/horizon-region-exclusions.csv

diff --git a/openstack/python-horizon/centos/files/horizon-region-exclusions.csv b/openstack/python-horizon/centos/files/horizon-region-exclusions.csv
deleted file mode 100755
index e5d27ff6..00000000
--- a/openstack/python-horizon/centos/files/horizon-region-exclusions.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This file is used by horizon to prevent specific regions from being
-# populated in the region selector.  The contents of this file are a single
-# CSV list containing the region names meant to be ignored,
-# as shown in the example below (currently commented out).
-#
-# After modifying this file on the active controller, run the ‘sudo service horizon restart’ 
-# command and then lock/unlock the inactive controller
-#
-# Note: ignoring this system's region is not supported
-
-#regionSeven,externalRegion,region_to_ignore
diff --git a/openstack/python-horizon/centos/files/horizon.init b/openstack/python-horizon/centos/files/horizon.init
index 36f2340d..a2b15bc8 100755
--- a/openstack/python-horizon/centos/files/horizon.init
+++ b/openstack/python-horizon/centos/files/horizon.init
@@ -79,15 +79,6 @@ start()
     sm-query service drbd-platform | grep enabled-active > /dev/null 2>&1
     IS_ACTIVE=$?
 
-    # Handle horizon region exclusions
-    if [ $IS_ACTIVE -eq 0 ]; then
-        # Only copy if the file has been modified
-        if ! cmp --silent ${BRANDDIR}/horizon-region-exclusions.csv ${CONFIG_PATH}/branding/horizon-region-exclusions.csv ; then
-            mkdir -p ${CONFIG_PATH}/branding
-            cp -r ${BRANDDIR}/horizon-region-exclusions.csv ${CONFIG_PATH}/branding 1>/dev/null 2>&1
-        fi
-    fi
-
     if ls ${BRANDDIR}/*.tgz 1> /dev/null 2>&1; then
         LATESTBRANDING=$(ls $BRANDDIR |grep '\.tgz$' | tail -n 1)
         if [ $IS_ACTIVE -eq 0 ]; then
diff --git a/openstack/python-horizon/centos/python-django-horizon.spec b/openstack/python-horizon/centos/python-django-horizon.spec
index bc96c806..39cf4c57 100755
--- a/openstack/python-horizon/centos/python-django-horizon.spec
+++ b/openstack/python-horizon/centos/python-django-horizon.spec
@@ -26,7 +26,6 @@ Source5:    python-django-horizon-logrotate.conf
 Source7:    horizon.init
 Source8:    horizon-clearsessions
 Source11:   horizon-patching-restart
-Source12:   horizon-region-exclusions.csv
 Source13:   guni_config.py
 Source14:   horizon-assets-compress
 
@@ -340,7 +339,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 install -m 755 -D -p  %{SOURCE7} %{buildroot}%{_sysconfdir}/rc.d/init.d/horizon
 install -m 755 -D -p %{SOURCE8} %{buildroot}/%{_bindir}/horizon-clearsessions
 install -m 755 -D -p %{SOURCE11} %{buildroot}/%{_bindir}/horizon-patching-restart
-install -m 755 -D -p %{SOURCE12} %{buildroot}/opt/branding/horizon-region-exclusions.csv
 install -m 755 -D -p %{SOURCE14} %{buildroot}/%{_bindir}/horizon-assets-compress
 
 # drop httpd-conf snippet
@@ -493,7 +491,6 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 
 # STX
 %dir /opt/branding
-%config(noreplace) /opt/branding/horizon-region-exclusions.csv
 %{_sysconfdir}/rc.d/init.d/horizon
 %{_bindir}/horizon-clearsessions
 %{_bindir}/horizon-patching-restart