From 7d74149e8ffd8fd1997b38672e7e48f9fef887f4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 27 Nov 2019 09:24:08 +0900
Subject: [PATCH] Remove configuration related to Horizon

Because we never have Horizon deployed in undercloud node,
we don't need to have any parameteres for it.

This patch removes useless hieradata which is never refered,
in addition to remove unnecessory firewall rule to allow
tcp/80(Horizon).

Closes-Bug: #1854117
Change-Id: I0bdb23133e412d7427f2d91e8ac04f9b8a82c150
(cherry picked from commit 0302c8385f15c6a3f7c22817f80a0bed39946f4a)
---
 .../puppet-stack-config.yaml.template               | 13 -------------
 instack_undercloud/undercloud.py                    |  5 ++++-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 4cdfc01e2..e3a8edd54 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -669,15 +669,6 @@ rabbitmq::wipe_db_on_cookie_change: true
 rabbitmq::default_user: {{UNDERCLOUD_RABBIT_USERNAME}}
 rabbitmq::default_pass: {{UNDERCLOUD_RABBIT_PASSWORD}}
 
-# Horizon
-horizon::django_debug: "%{hiera('debug')}"
-horizon_secret_key: {{UNDERCLOUD_HORIZON_SECRET_KEY}}
-horizon::allowed_hosts:
- - "%{::fqdn}"
- - "{{LOCAL_IP}}"
-horizon::wsgi::apache::priority: 10
-horizon::openstack_endpoint_type: internalURL
-
 # Mistral
 mistral::debug: "%{hiera('debug')}"
 mistral::notification_driver: "%{hiera('notification_driver')}"
@@ -1029,10 +1020,6 @@ tripleo::firewall::firewall_rules:
       - 13003
       - 8004
       - 13004
-  '126 horizon':
-    dport:
-      - 80
-      - 443
   '127 snmp':
     dport: 161
     proto: 'udp'
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index a3cb39222..2baf59bb9 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -549,8 +549,11 @@ _auth_opts = [
                      'If left unset, one will be automatically generated.')
                ),
     cfg.StrOpt('undercloud_horizon_secret_key',
+               deprecated_for_removal=True,
                help=('Horizon secret key. '
-                     'If left unset, one will be automatically generated.')
+                     'If left unset, one will be automatically generated.'
+                     'This parameter does not have any effect because '
+                     'Horizon is no more deployed in undercloud.')
                ),
     cfg.StrOpt('undercloud_cinder_password',
                help=('Cinder service password. '