x/packstack
Code Issues Proposed changes

Merge "Fix Nova Networking with Manila Generic Driver"

Browse Source
This commit is contained in:
Jenkins
2015-06-03 07:08:16 +00:00
committed by Gerrit Code Review
parent 9794ec4d8c af0eef806d
commit 1c56a4980f
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/puppet/templates/manila_generic.pp
View File

@@ -7,14 +7,22 @@ manila::backend::generic{ 'generic':
share_mount_path => hiera('CONFIG_MANILA_GENERIC_SHARE_MOUNT_PATH'), share_mount_path => hiera('CONFIG_MANILA_GENERIC_SHARE_MOUNT_PATH'),
} }
packstack::manila::network{ 'generic': }
if ($::manila_network_type == 'neutron'){
$service_instance_network_helper_type = 'neutron'
}
elsif ($::manila_network_type == 'nova-network'){
$service_instance_network_helper_type = 'nova'
}
manila::service_instance{ 'generic': manila::service_instance{ 'generic':
service_image_location => hiera('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'), service_image_location => hiera('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),
service_instance_user => hiera('CONFIG_MANILA_SERVICE_INSTANCE_USER'), service_instance_user => hiera('CONFIG_MANILA_SERVICE_INSTANCE_USER'),
service_instance_password => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'), service_instance_password => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),
service_instance_network_helper_type => $service_instance_network_helper_type,
} }
packstack::manila::network{ 'generic': }
class { '::manila::compute::nova': class { '::manila::compute::nova':
nova_admin_password => hiera('CONFIG_NOVA_KS_PW'), nova_admin_password => hiera('CONFIG_NOVA_KS_PW'),
nova_admin_tenant_name => 'services', nova_admin_tenant_name => 'services',