From cdce65804afb96a957f4472d433af08b049b6713 Mon Sep 17 00:00:00 2001 From: David Juran Date: Mon, 4 Jan 2016 16:22:40 +0100 Subject: [PATCH 1/3] Fixed parsing error --- config/quickstack.yaml.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/quickstack.yaml.erb b/config/quickstack.yaml.erb index f2881307..c94fc829 100644 --- a/config/quickstack.yaml.erb +++ b/config/quickstack.yaml.erb @@ -46,12 +46,12 @@ cinder_nfs_mount_options: '' cinder_dell_sc_san_ip: 172.23.8.101 cinder_dell_sc_san_login: Admin cinder_dell_sc_san_password: <%= passwd_auto %> -cinder_dell_sc_iscsi_ip_address:192.168.0.20 -cinder_dell_sc_iscsi_port:3260 -cinder_dell_sc_ssn:64702 -cinder_dell_sc_api_port:3033 -cinder_dell_sc_server_folder:server -cinder_dell_sc_volume_folder:volume +cinder_dell_sc_iscsi_ip_address: 192.168.0.20 +cinder_dell_sc_iscsi_port: 3260 +cinder_dell_sc_ssn: 64702 +cinder_dell_sc_api_port: 3033 +cinder_dell_sc_server_folder: server +cinder_dell_sc_volume_folder: volume cinder_san_ip: 192.168.124.11 cinder_san_login: grpadmin cinder_san_password: <%= passwd_auto %> From 11408e5d3348eb0bcdc925413276bbcdca47eb94 Mon Sep 17 00:00:00 2001 From: David Juran Date: Mon, 4 Jan 2016 21:27:16 +0100 Subject: [PATCH 2/3] Satellite 6 API requires override is set to true when a SmartCalss Parameter is overridden --- bin/quickstack_defaults.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/quickstack_defaults.rb b/bin/quickstack_defaults.rb index ef638753..5fe2bd71 100755 --- a/bin/quickstack_defaults.rb +++ b/bin/quickstack_defaults.rb @@ -263,7 +263,8 @@ def smart_class_params_set(params) data = { 'id' => param['id'], 'smart_class_parameter' => { 'default_value' => default_value, - 'parameter_type' => parameter_type + 'parameter_type' => parameter_type, + 'override' => true, } } @foreman.smart_params.update(data) From d764d49a9a98145d91a1327725bf6ff1b40e7267 Mon Sep 17 00:00:00 2001 From: David Juran Date: Tue, 5 Jan 2016 13:20:08 +0100 Subject: [PATCH 3/3] Fixed quickstack_defaults script to work with empty has as parameter --- bin/quickstack_defaults.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/quickstack_defaults.rb b/bin/quickstack_defaults.rb index 5fe2bd71..35ec62e5 100755 --- a/bin/quickstack_defaults.rb +++ b/bin/quickstack_defaults.rb @@ -260,6 +260,10 @@ def smart_class_params_set(params) default_value = [].to_json end + if parameter_type == 'hash' && default_value.empty? + default_value = {}.to_json + end + data = { 'id' => param['id'], 'smart_class_parameter' => { 'default_value' => default_value,