x
/
fuel-plugin-purestorage-cinder
Code Issues Proposed changes

Code fixes 

Change-Id: I3b55bc97ff7f157d2dcc4b250b66169af2e6b93f
This commit is contained in:
Simon Dodsley 2016-02-18 09:56:05 -05:00
parent 58fb27f4ee
commit b30de2e8a0
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/puppet/parser/functions/get_random_id.rb
View File

@ -8,7 +8,7 @@ module Puppet::Parser::Functions
raise(Puppet::ParseError, "get_random_id(): Wrong number of arguments " +
"given (#{args.size} for 1)") if args.size != 1
numbers = (0..9).to_a
alpha = ('a'..'z').to_a
alpha = ('a'..'f').to_a
length = args[0].to_i
CHARS = (alpha + numbers)
id = CHARS.sort_by { rand }.join[0...length]

49
deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
View File

@ -46,18 +46,6 @@ class plugin_purestorage_cinder::controller (
$section = 'DEFAULT'
}
cinder::backend::pure { $section :
san_ip => $plugin_settings['pure_san_ip'],
pure_api_token => $plugin_settings['pure_api'],
volume_backend_name => $section,
use_chap_auth => $plugin_settings['pure_chap'],
use_multipath_for_image_xfer => $plugin_settings['pure_multipath'],
pure_storage_protocol => $plugin_settings['pure_protocol'],
extra_options => { "$section/backend_host" => { value => $section },
"$section/image_volume_cache_enabled" => { value => $plugin_settings["pure_glance_image_cache"] }
}
}
# Insert Glance Image Cache for Cinder settings
# Until we can do this correctly with Keystone and get back the created IDs
# we will do this with the get_random_id below.
@ -80,22 +68,31 @@ class plugin_purestorage_cinder::controller (
# roles => ['admin'],
# ensure => present
# }
#
#
# Currently there is no way to recover a user or tenant ID from keystone in puppet.
# Luckily the glance image cache doesn't actually use keystone to check the IDs so
# we can just, temporarily, assign a randon ID to the two fields.
# When keystone-puppet has the functionality we need we will fix this workaround
if $plugin_settings['pure_glance_image_cache'] {
$PROJECT_ID = get_random_id(32)
$USER_ID = get_random_id(32)
cinder_config {
"DEFAULT/cinder_internal_tenant_project_id": value => "$PROJECT_ID";
"DEFAULT/cinder_internal_tenant_user_id": value => "$USER_ID";
}
}
cinder::backend::pure { DEFAULT :
extra_options => { "DEFAULT/cinder_internal_tenant_project_id" => { value => "$PROJECT_ID" },
"DEFALUT/cinder_internal_tenant_user_id" => { value => "$USER_ID" }
}
}
cinder::backend::pure { $section :
extra_options => { "$section/image_volume_cache_max_count" => { value => $plugin_settings["pure_glance_cache_count"] },
cinder::backend::pure { $section :
san_ip => $plugin_settings['pure_san_ip'],
pure_api_token => $plugin_settings['pure_api'],
volume_backend_name => $section,
use_chap_auth => $plugin_settings['pure_chap'],
use_multipath_for_image_xfer => $plugin_settings['pure_multipath'],
pure_storage_protocol => $plugin_settings['pure_protocol'],
extra_options => { "$section/backend_host" => { value => $section },
"$section/image_volume_cache_enabled" => { value => $plugin_settings["pure_glance_image_cache"] },
"$section/image_volume_cache_max_count" => { value => $plugin_settings["pure_glance_cache_count"] },
"$section/image_volume_cache_max_size_gb" => { value => $plugin_settings["pure_glance_cache_size"] }
}
}
@ -130,7 +127,7 @@ class plugin_purestorage_cinder::controller (
}
'2': {
cinder_config {
"fc-zone-manager/fc_fabric_names": value => join($plugin_settings["pure_fabric_name_1"],', ',$plugin_settings["pure_fabric_name_2"]);
"fc-zone-manager/fc_fabric_names": value => join([$plugin_settings["pure_fabric_name_1"],", ",$plugin_settings["pure_fabric_name_2"]],'');
}
}
}
@ -148,7 +145,7 @@ class plugin_purestorage_cinder::controller (
"$fabric_zone_1/fc_fabric_port": value => '22';
"$fabric_zone_1/zoning_policy": value => 'initiator-target';
"$fabric_zone_1/zone_activate": value => 'true';
"$fabric_zone_1/zone_name_prefix": value => join($plugin_settings["pure_fabric_name_1"],'_');
"$fabric_zone_1/zone_name_prefix": value => join([$plugin_settings["pure_fabric_name_1"],"_"],'');
}
if $plugin_settings['pure_fabric_count'] == '2' {
cinder_config {
@ -158,7 +155,7 @@ class plugin_purestorage_cinder::controller (
"$fabric_zone_2/fc_fabric_port": value => '22';
"$fabric_zone_2/zoning_policy": value => 'initiator-target';
"$fabric_zone_2/zone_activate": value => 'true';
"$fabric_zone_2/zone_name_prefix": value => join($plugin_settings["pure_fabric_name_2"],'_');
"$fabric_zone_2/zone_name_prefix": value => join([$plugin_settings["pure_fabric_name_2"],"_"],'');
}
}
}
@ -171,7 +168,7 @@ class plugin_purestorage_cinder::controller (
"$fabric_zone_1/cisco_zoning_vsan": value => $plugin_settings["pure_vsan_1"];
"$fabric_zone_1/cisco_zoning_policy": value => 'initiator-target';
"$fabric_zone_1/cisco_zone_activate": value => 'true';
"$fabric_zone_1/cisco_zone_name_prefix": value => join($plugin_settings["pure_fabric_name_1"],'_');
"$fabric_zone_1/cisco_zone_name_prefix": value => join([$plugin_settings["pure_fabric_name_1"],"_"],'');
}
if $plugin_settings['pure_fabric_count'] == '2' {
cinder_config {
@ -182,7 +179,7 @@ class plugin_purestorage_cinder::controller (
"$fabric_zone_2/cisco_zoning_vsan": value => $plugin_settings["pure_vsan_2"];
"$fabric_zone_2/cisco_zoning_policy": value => 'initiator-target';
"$fabric_zone_2/cisco_zone_activate": value => 'true';
"$fabric_zone_2/cisco_zone_name_prefix": value => join($plugin_settings["pure_fabric_name_2"],'_');
"$fabric_zone_2/cisco_zone_name_prefix": value => join([$plugin_settings["pure_fabric_name_2"],"_"],'');
}
}
}