openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "[ui] Add option to configure apache expires"

This commit is contained in:
Zuul 2018-11-27 19:26:05 +00:00 committed by Gerrit Code Review
parent e78e640b7a 4f82b2eb9b
commit a615808456
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/ui.pp
View File

@ -108,6 +108,12 @@
# List of enabled loggers
# Defaults to ['console', 'zaqar']
#
# [*httpd_expires*]
# A list of strings passed to ::apache::vhost::directories::expires_by_type
# [
# 'text/javascript "access plus 1 months"'
# ]
#
class tripleo::ui (
$servername = $::fqdn,
$bind_host = hiera('controller_host'),
@ -131,6 +137,9 @@ class tripleo::ui (
$endpoint_config_nova = undef,
$endpoint_config_swift = undef,
$enabled_loggers = ['console', 'zaqar'],
$httpd_expires = [
'text/javascript "access plus 1 months"'
]
) {
package {'openstack-tripleo-ui': }
@ -149,6 +158,15 @@ class tripleo::ui (
docroot => '/var/www/openstack-tripleo-ui/dist',
options => ['Indexes', 'FollowSymLinks'],
fallbackresource => '/index.html',
directories => [
{
path => '/var/www/openstack-tripleo-ui/dist',
provider => 'directory',
options => ['Indexes', 'FollowSymLinks'],
expires_active => bool2str(!empty($httpd_expires), 'On', 'Off'),
expires_by_type => $httpd_expires
}
],
proxy_pass => [
{
'path' => '/zaqar',

16
spec/classes/tripleo_ui_spec.rb
View File

@ -49,9 +49,21 @@ describe 'tripleo::ui' do
:port => 3000,
:docroot => '/var/www/openstack-tripleo-ui/dist',
:options => [ 'Indexes', 'FollowSymLinks' ],
:fallbackresource => '/index.html'
:fallbackresource => '/index.html',
:directories => [
{
"path" => '/var/www/openstack-tripleo-ui/dist',
"provider" => 'directory',
"options" => ['Indexes', 'FollowSymLinks'],
"expires_active" => 'On',
"expires_by_type" => [
'text/javascript "access plus 1 months"'
]
}
]
)
is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf').with_content(/cleaned by Puppet/)
is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf')
.with_content(/cleaned by Puppet/)
is_expected.to contain_file('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js')
.with_content(/'keystone': 'https:\/\/127.0.0.1:443\/keystone\/v2.0'/)
.with_content(/'heat': 'https:\/\/127.0.0.1:443\/heat\/v1\/%\(tenant_id\)s'/)