From cf264dbe6c6ab10629b023bf43c848132201ed4f Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Thu, 4 Jul 2019 10:20:54 +0530
Subject: [PATCH] Use nova::metadata::neutron_metadata_proxy_shared_secret

neutron_metadata_proxy_shared_secret deprecated option
from nova::api is removed in [1], let's use the recommended
nova::metadata::neutron_metadata_proxy_shared_secret.

Also run metadata with wsgi as running with eventlet
is deprecated.

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

Change-Id: I54a0761ed5c66faf977109be0ae9e5811794fab5
---
 .../modules/packstack/manifests/nova/api.pp   | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp
index ef44fb437..d81d92326 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp
@@ -25,14 +25,29 @@ class packstack::nova::api ()
 
     class { '::nova::api':
       api_bind_address                     => $bind_host,
-      metadata_listen                      => $bind_host,
       enabled                              => true,
-      neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
       sync_db                              => false,
       sync_db_api                          => false,
       osapi_compute_workers                => hiera('CONFIG_SERVICE_WORKERS'),
-      metadata_workers                     => hiera('CONFIG_SERVICE_WORKERS'),
       allow_resize_to_same_host            => hiera('CONFIG_NOVA_ALLOW_RESIZE_TO_SAME'),
+      nova_metadata_wsgi_enabled           => true,
+      service_name                         => 'httpd',
+    }
+
+    class { '::nova::metadata':
+      neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
+    }
+
+    class { '::nova::wsgi::apache_api':
+      bind_host => $bind_host,
+      ssl       => false,
+      workers   => hiera('CONFIG_SERVICE_WORKERS'),
+    }
+
+    class { '::nova::wsgi::apache_metadata':
+      bind_host => $bind_host,
+      ssl       => false,
+      workers   => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
     class { '::nova::db::sync':