From e7516d3dc8d9cdd101538b222c19aa562e931fc0 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Wed, 3 Jul 2019 19:26:50 +0530
Subject: [PATCH] Do not use deprecated wsgi_script_source

app.wsgi script is deprecated for long in ironic
in favor of ironic-api-wsgi script, the deprecated script
is now removed in [1]. Let's use ironic-api-wsgi script
as a wsgi_script_source path.

[1] https://review.opendev.org/#/c/668515/

Change-Id: I08016ca7b82e6987a341ffb8e3c0e5bfc872e46f
---
 manifests/params.pp                                        | 4 ++--
 ...use_deprecated_wsgi_script_source-4c37c6dae485baf1.yaml | 7 +++++++
 spec/classes/ironic_wsgi_apache_spec.rb                    | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/do_not_use_deprecated_wsgi_script_source-4c37c6dae485baf1.yaml

diff --git a/manifests/params.pp b/manifests/params.pp
index 43ed7c45..794469c4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -60,7 +60,7 @@ class ironic::params {
       $systemd_python_package    = 'systemd-python'
       $ipxe_rom_dir              = '/usr/share/ipxe'
       $ironic_wsgi_script_path   = '/var/www/cgi-bin/ironic'
-      $ironic_wsgi_script_source = "/usr/lib/python${$pyver3}/site-packages/ironic/api/app.wsgi"
+      $ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
       $tftpd_package             = 'tftp-server'
       $ipxe_package              = 'ipxe-bootimgs'
       $syslinux_package          = 'syslinux-tftpboot'
@@ -88,7 +88,7 @@ class ironic::params {
       $systemd_python_package    = 'python-systemd'
       $ipxe_rom_dir              = '/usr/lib/ipxe'
       $ironic_wsgi_script_path   = '/usr/lib/cgi-bin/ironic'
-      $ironic_wsgi_script_source = "/usr/lib/python${$pyver3}/dist-packages/ironic/api/app.wsgi"
+      $ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
       $tftpd_package             = 'tftpd'
       $ipxe_package              = 'ipxe'
       $syslinux_package          = 'syslinux-common'
diff --git a/releasenotes/notes/do_not_use_deprecated_wsgi_script_source-4c37c6dae485baf1.yaml b/releasenotes/notes/do_not_use_deprecated_wsgi_script_source-4c37c6dae485baf1.yaml
new file mode 100644
index 00000000..21399fa3
--- /dev/null
+++ b/releasenotes/notes/do_not_use_deprecated_wsgi_script_source-4c37c6dae485baf1.yaml
@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    app.wsgi script in ironic is deprecated from long in
+    favor of ironic-api-wsgi script, wsgi_script_source
+    default is changed to use ironic-api-wsgi instead of
+    app.wsgi.
diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb
index d3d7cae9..579f9fa4 100644
--- a/spec/classes/ironic_wsgi_apache_spec.rb
+++ b/spec/classes/ironic_wsgi_apache_spec.rb
@@ -94,14 +94,14 @@ describe 'ironic::wsgi::apache' do
               :httpd_service_name => 'apache2',
               :httpd_ports_file   => '/etc/apache2/ports.conf',
               :wsgi_script_path   => '/usr/lib/cgi-bin/ironic',
-              :wsgi_script_source => '/usr/lib/python3/dist-packages/ironic/api/app.wsgi',
+              :wsgi_script_source => '/usr/bin/ironic-api-wsgi',
             }
         when 'RedHat'
             {
               :httpd_service_name => 'httpd',
               :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
               :wsgi_script_path   => '/var/www/cgi-bin/ironic',
-              :wsgi_script_source => '/usr/lib/python2.7/site-packages/ironic/api/app.wsgi',
+              :wsgi_script_source => '/usr/bin/ironic-api-wsgi',
             }
         end
       end