Browse Source

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 0302c8385f)
changes/17/699917/2
Takashi Kajinami 2 months ago
parent
commit
7d74149e8f
2 changed files with 4 additions and 14 deletions
  1. +0
    -13
      elements/puppet-stack-config/puppet-stack-config.yaml.template
  2. +4
    -1
      instack_undercloud/undercloud.py

+ 0
- 13
elements/puppet-stack-config/puppet-stack-config.yaml.template View File

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

+ 4
- 1
instack_undercloud/undercloud.py View File

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

Loading…
Cancel
Save