openstack/puppet-openstacklib
Code Issues Proposed changes

wsgi/apache: do not harcode "wsgi" in service name

Browse Source 
Because of backward compatibility with puppet-keystone, we should not
hardcode the name of the service.

Change-Id: Icf2356ea13344a57ed46b18a277e4534e510873c
This commit is contained in:
Emilien Macchi
2014-12-30 16:50:26 -05:00
parent 99bb19a0c4
commit c6b739f6ad
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/wsgi/apache.pp
View File

@@ -144,9 +144,9 @@ define openstacklib::wsgi::apache (
} }
} }
file { "${service_name}_wsgi": file { $service_name:
ensure => file, ensure => file,
path => "${wsgi_script_path}/${service_name}_wsgi", path => "${wsgi_script_path}/${service_name}",
source => $wsgi_script_source, source => $wsgi_script_source,
owner => $user, owner => $user,
group => $group, group => $group,
@@ -162,7 +162,7 @@ define openstacklib::wsgi::apache (
} }
$wsgi_script_aliases = hash([$path_real,$wsgi_script_path]) $wsgi_script_aliases = hash([$path_real,$wsgi_script_path])
::apache::vhost { "${service_name}_wsgi": ::apache::vhost { $service_name:
ensure => 'present', ensure => 'present',
servername => $servername, servername => $servername,
ip => $bind_host, ip => $bind_host,
@@ -183,7 +183,7 @@ define openstacklib::wsgi::apache (
wsgi_daemon_process_options => $wsgi_daemon_process_options, wsgi_daemon_process_options => $wsgi_daemon_process_options,
wsgi_process_group => $service_name, wsgi_process_group => $service_name,
wsgi_script_aliases => $wsgi_script_aliases, wsgi_script_aliases => $wsgi_script_aliases,
require => File["${service_name}_wsgi"], require => File[$service_name],
} }
} }

6
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'openstacklib::wsgi::apache' do describe 'openstacklib::wsgi::apache' do
let (:title) { 'keystone' } let (:title) { 'keystone_wsgi' }
let :global_facts do let :global_facts do
{ {
@@ -71,8 +71,8 @@ describe 'openstacklib::wsgi::apache' do
'docroot_owner' => 'keystone', 'docroot_owner' => 'keystone',
'docroot_group' => 'keystone', 'docroot_group' => 'keystone',
'ssl' => 'true', 'ssl' => 'true',
'wsgi_daemon_process' => 'keystone', 'wsgi_daemon_process' => 'keystone_wsgi',
'wsgi_process_group' => 'keystone', 'wsgi_process_group' => 'keystone_wsgi',
'wsgi_script_aliases' => { '/' => "/var/www/cgi-bin/keystone" }, 'wsgi_script_aliases' => { '/' => "/var/www/cgi-bin/keystone" },
'require' => 'File[keystone_wsgi]' 'require' => 'File[keystone_wsgi]'
)} )}