Skip to content

Sat6 #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djuran wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Sat6 #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdce658
Fixed parsing error
djuran Jan 4, 2016
11408e5
Satellite 6 API requires override is set to true when a SmartCalss Pa…
djuran Jan 4, 2016
d764d49
Fixed quickstack_defaults script to work with empty has as parameter
djuran Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bin/quickstack_defaults.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,15 @@ 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,
'parameter_type' => parameter_type
'parameter_type' => parameter_type,
'override' => true,
}
}
@foreman.smart_params.update(data)
Expand Down
12 changes: 6 additions & 6 deletions config/quickstack.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand Down