Merge "Manila: Switch to httpd + mod_wsgi"
This commit is contained in:
		@@ -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':
 | 
			
		||||
 
 | 
			
		||||
@@ -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'),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user