starlingx
/
upstream
Code Issues Proposed changes

Merge "Removing horizon-region-exclusion support"

This commit is contained in:
Zuul 2019-05-31 04:40:45 +00:00 committed by Gerrit Code Review
parent 1a63bf6b7d 9d0c89a76c
commit 5dd801610d
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack/python-horizon/centos/files/horizon-region-exclusions.csv
View File

@ -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
1 #
2 # This file is used by horizon to prevent specific regions from being
3 # populated in the region selector. The contents of this file are a single
4 # CSV list containing the region names meant to be ignored,
5 # as shown in the example below (currently commented out).
6 #
7 # After modifying this file on the active controller, run the ‘sudo service horizon restart’
8 # command and then lock/unlock the inactive controller
9 #
10 # Note: ignoring this system's region is not supported
11 #regionSeven,externalRegion,region_to_ignore

9
openstack/python-horizon/centos/files/horizon.init
View File

@ -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

3
openstack/python-horizon/centos/python-django-horizon.spec
View File

@ -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