x/packstack
Code Issues Proposed changes

Merge "Manila: Switch to httpd + mod_wsgi"

Browse Source
This commit is contained in:
Zuul
2024-11-13 11:51:00 +00:00
committed by Gerrit Code Review
parent 5423538757 0b49900ada
commit b38c8f653e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/puppet/modules/packstack/manifests/manila.pp
View File

@@ -15,7 +15,11 @@ class packstack::manila ()
} }
class { 'manila::api': 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': class { 'manila::scheduler':

2
packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
View File

@@ -22,7 +22,7 @@ class packstack::manila::backend::generic ()
disk => '1', disk => '1',
vcpus => '1', vcpus => '1',
} }
-> manila::backend::service_instance{ 'generic': manila::backend::service_instance{ 'generic':
service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'), service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),
service_instance_user => lookup('CONFIG_MANILA_SERVICE_INSTANCE_USER'), service_instance_user => lookup('CONFIG_MANILA_SERVICE_INSTANCE_USER'),
service_instance_password => lookup('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'), service_instance_password => lookup('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),