openstack/puppet-horizon
Code Issues Proposed changes

Remove unused parameters

Browse Source 
This change removes some parameters from horizon::params which are
not used in any manifest files in this module.

Change-Id: Id72d430817bde68697341eab2c23df83ba7922f7
This commit is contained in:
Takashi Kajinami 2021-09-06 10:29:56 +09:00
parent 7a6a35db96
commit 3cc9bf9e65
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -10,8 +10,6 @@ class horizon::params {
case $::osfamily {
'RedHat': {
$http_service = 'httpd'
$http_modwsgi = 'mod_wsgi'
$package_name = 'openstack-dashboard'
$config_dir = '/etc/openstack-dashboard'
$conf_d_dir = '/etc/openstack-dashboard/local_settings.d'
@ -20,8 +18,6 @@ class horizon::params {
$httpd_listen_config_file = '/etc/httpd/conf/httpd.conf'
$root_url = '/dashboard'
$static_path = '/usr/share'
$apache_user = 'apache'
$apache_group = 'apache'
$wsgi_user = 'apache'
$wsgi_group = 'apache'
$memcache_package = 'python3-memcached'
@ -30,15 +26,12 @@ class horizon::params {
$octavia_dashboard_package_name = 'openstack-octavia-ui'
}
'Debian': {
$http_service = 'apache2'
$config_dir = '/etc/openstack-dashboard'
$conf_d_dir = '/etc/openstack-dashboard/local_settings.d'
$config_file = '/etc/openstack-dashboard/local_settings.py'
$httpd_listen_config_file = '/etc/apache2/ports.conf'
$root_url = '/horizon'
$static_path = '/var/lib'
$apache_user = 'www-data'
$apache_group = 'www-data'
$wsgi_user = 'horizon'
$wsgi_group = 'horizon'
$memcache_package = 'python3-memcache'

6
spec/classes/horizon_wsgi_apache_spec.rb
View File

@ -543,8 +543,6 @@ describe 'horizon::wsgi::apache' do
{ :http_service => 'apache2',
:httpd_config_file => '/etc/apache2/sites-available/openstack-dashboard-alias-only.conf',
:root_url => '/horizon',
:apache_user => 'www-data',
:apache_group => 'www-data',
:wsgi_user => 'horizon',
:wsgi_group => 'horizon',
:unix_user => 'horizon',
@ -553,8 +551,6 @@ describe 'horizon::wsgi::apache' do
{ :http_service => 'apache2',
:httpd_config_file => '/etc/apache2/conf-available/openstack-dashboard.conf',
:root_url => '/horizon',
:apache_user => 'www-data',
:apache_group => 'www-data',
:wsgi_user => 'horizon',
:wsgi_group => 'horizon',
:unix_user => 'horizon',
@ -564,8 +560,6 @@ describe 'horizon::wsgi::apache' do
{ :http_service => 'httpd',
:httpd_config_file => '/etc/httpd/conf.d/openstack-dashboard.conf',
:root_url => '/dashboard',
:apache_user => 'apache',
:apache_group => 'apache',
:wsgi_user => 'apache',
:wsgi_group => 'apache',
:unix_user => 'apache',