openstack/puppet-horizon
Code Issues Proposed changes

Convert all class usage to relative names

Browse Source 
Change-Id: Ie49b15e2332494ea8b96adde345063e0dcc61c32
This commit is contained in:
Tobias Urdin 2019-12-08 23:08:07 +01:00
parent abefb0dab2
commit 0f638cb475
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -57,7 +57,7 @@ class { 'memcached':
udp_port => '11211',
}
class { '::horizon':
class { 'horizon':
cache_server_ip => '127.0.0.1',
cache_server_port => '11211',
secret_key => '12345',

4
manifests/init.pp
View File

@ -545,7 +545,7 @@ class horizon(
$horizon_upload_mode = undef,
) inherits ::horizon::params {
include ::horizon::deps
include horizon::deps
if $cache_server_url and $cache_server_ip {
fail('Only one of cache_server_url or cache_server_ip can be set.')
@ -665,7 +665,7 @@ class horizon(
}
if $configure_apache {
class { '::horizon::wsgi::apache':
class { 'horizon::wsgi::apache':
bind_address => $bind_address,
servername => $servername,
server_aliases => $server_aliases,

2
manifests/params.pp
View File

@ -1,7 +1,7 @@
# these parameters need to be accessed from several locations and
# should be considered to be constant
class horizon::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$logdir = '/var/log/horizon'

8
manifests/wsgi/apache.pp
View File

@ -115,9 +115,9 @@ class horizon::wsgi::apache (
$access_log_format = false,
) inherits horizon::params {
include ::horizon::deps
include ::apache
include ::apache::mod::wsgi
include horizon::deps
include apache
include apache::mod::wsgi
# We already use apache::vhost to generate our own
# configuration file, let's clean the configuration
@ -143,7 +143,7 @@ class horizon::wsgi::apache (
}
if $listen_ssl {
include ::apache::mod::ssl
include apache::mod::ssl
$ensure_ssl_vhost = 'present'
if $horizon_cert == undef {

12
spec/acceptance/horizon_with_apache_spec.rb
View File

@ -6,10 +6,10 @@ describe 'horizon class' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include openstack_integration
include openstack_integration::repos
class { '::horizon':
class { 'horizon':
secret_key => 'big_secret',
# need to disable offline compression due to
# https://bugs.launchpad.net/ubuntu/+source/horizon/+bug/1424042
@ -47,10 +47,10 @@ describe 'horizon class' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include openstack_integration
include openstack_integration::repos
class { '::horizon':
class { 'horizon':
secret_key => 'big_secret',
# need to disable offline compression due to
# https://bugs.launchpad.net/ubuntu/+source/horizon/+bug/1424042