From 0b49900ada38906c504a25cf00a50fdb0e0ab28c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 26 Oct 2024 02:37:18 +0900 Subject: [PATCH] Manila: Switch to httpd + mod_wsgi Change-Id: Iac76e5348676073306b3bdef9d95e3523ffe4c96 --- packstack/puppet/modules/packstack/manifests/manila.pp | 6 +++++- .../modules/packstack/manifests/manila/backend/generic.pp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/manila.pp b/packstack/puppet/modules/packstack/manifests/manila.pp index 74c8f4982..68bd03e12 100644 --- a/packstack/puppet/modules/packstack/manifests/manila.pp +++ b/packstack/puppet/modules/packstack/manifests/manila.pp @@ -15,7 +15,11 @@ class packstack::manila () } class { 'manila::api': - bind_host => $bind_host, + service_name => 'httpd', + } + class { 'manila::wsgi::apache': + bind_host => $bind_host, + workers => lookup('CONFIG_SERVICE_WORKERS'), } class { 'manila::scheduler': diff --git a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp index 3957b149e..1cf617050 100644 --- a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp +++ b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp @@ -22,7 +22,7 @@ class packstack::manila::backend::generic () disk => '1', vcpus => '1', } - -> manila::backend::service_instance{ 'generic': + manila::backend::service_instance{ 'generic': service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'), service_instance_user => lookup('CONFIG_MANILA_SERVICE_INSTANCE_USER'), service_instance_password => lookup('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),