x/packstack
Code Issues Proposed changes

Merge "Set manila nova_flavor id"

Browse Source
This commit is contained in:
Jenkins 2016-02-19 01:59:03 +00:00 committed by Gerrit Code Review
commit f36648bb72
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
packstack/plugins/manila_255.py → packstack/plugins/manila_355.py
View File

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

@ -16,11 +16,23 @@ elsif ($::manila_network_type == 'nova-network'){
$service_instance_network_helper_type = 'nova'
}
$admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$admin_tenant = 'admin'
$keystone_url = hiera('CONFIG_KEYSTONE_PUBLIC_URL')
exec { 'create m1.manila nova flavor':
path => '/usr/bin:/bin:/usr/sbin:/sbin',
provider => shell,
command => "nova --os-username $admin_username --os-password $admin_password --os-tenant-name $admin_tenant --os-auth-url $keystone_url flavor-create m1.manila 66 512 0 1",
unless => "nova --os-username $admin_username --os-password $admin_password --os-tenant-name $admin_tenant --os-auth-url $keystone_url flavor-list | grep 66",
} ->
manila::service_instance{ 'generic':
service_image_location => hiera('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),
service_instance_user => hiera('CONFIG_MANILA_SERVICE_INSTANCE_USER'),
service_instance_password => hiera('CONFIG_MANILA_SERVICE_INSTANCE_PASSWORD'),
service_instance_network_helper_type => $service_instance_network_helper_type,
service_instance_flavor_id => 66,
}
class { '::manila::compute::nova':