From c6b739f6ad809cdebce40cb8bfed54d2190e832b Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 30 Dec 2014 16:50:26 -0500
Subject: [PATCH] wsgi/apache: do not harcode "wsgi" in service name

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

Change-Id: Icf2356ea13344a57ed46b18a277e4534e510873c
---
 manifests/wsgi/apache.pp                      | 8 ++++----
 spec/defines/openstacklib_wsgi_apache_spec.rb | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 469484aa..5daf4d11 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -144,9 +144,9 @@ define openstacklib::wsgi::apache (
     }
   }
 
-  file { "${service_name}_wsgi":
+  file { $service_name:
     ensure  => file,
-    path    => "${wsgi_script_path}/${service_name}_wsgi",
+    path    => "${wsgi_script_path}/${service_name}",
     source  => $wsgi_script_source,
     owner   => $user,
     group   => $group,
@@ -162,7 +162,7 @@ define openstacklib::wsgi::apache (
   }
   $wsgi_script_aliases = hash([$path_real,$wsgi_script_path])
 
-  ::apache::vhost { "${service_name}_wsgi":
+  ::apache::vhost { $service_name:
     ensure                      => 'present',
     servername                  => $servername,
     ip                          => $bind_host,
@@ -183,7 +183,7 @@ define openstacklib::wsgi::apache (
     wsgi_daemon_process_options => $wsgi_daemon_process_options,
     wsgi_process_group          => $service_name,
     wsgi_script_aliases         => $wsgi_script_aliases,
-    require                     => File["${service_name}_wsgi"],
+    require                     => File[$service_name],
   }
 
 }
diff --git a/spec/defines/openstacklib_wsgi_apache_spec.rb b/spec/defines/openstacklib_wsgi_apache_spec.rb
index bc3522d1..fdac465f 100644
--- a/spec/defines/openstacklib_wsgi_apache_spec.rb
+++ b/spec/defines/openstacklib_wsgi_apache_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
 
 describe 'openstacklib::wsgi::apache' do
 
-  let (:title) { 'keystone' }
+  let (:title) { 'keystone_wsgi' }
 
   let :global_facts do
     {
@@ -71,8 +71,8 @@ describe 'openstacklib::wsgi::apache' do
         'docroot_owner'       => 'keystone',
         'docroot_group'       => 'keystone',
         'ssl'                 => 'true',
-        'wsgi_daemon_process' => 'keystone',
-        'wsgi_process_group'  => 'keystone',
+        'wsgi_daemon_process' => 'keystone_wsgi',
+        'wsgi_process_group'  => 'keystone_wsgi',
         'wsgi_script_aliases' => { '/' => "/var/www/cgi-bin/keystone" },
         'require'             => 'File[keystone_wsgi]'
       )}