-
Notifications
You must be signed in to change notification settings - Fork 59
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.
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
[provisioner] Add autoyast self update option #823
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -301,13 +301,26 @@ def find_node_boot_mac_addresses(node, admin_data_net) | |
end | ||
|
||
when /^(open)?suse/ | ||
expanded_self_update_url = node[:provisioner][:suse][:autoyast][:self_update_url].gsub( | ||
"<ADMINWEB>", "#{admin_ip}:#{web_port}" | ||
) | ||
do_self_update = node[:provisioner][:suse][:autoyast][:do_self_update] | ||
if do_self_update && !expanded_self_update_url.empty? | ||
do_self_update = system("wget --quiet --spider " + | ||
expanded_self_update_url.gsub("$arch", "#{arch}")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. unexpected token tIDENTIFIER |
||
unless do_self_update | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Metrics/BlockNesting: Avoid more than 3 levels of block nesting. (https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count) |
||
Chef::Log.warn("AutoYaST self-update URL #{expanded_self_update_url} does not exist") | ||
end | ||
end | ||
|
||
append << "install=#{install_url} autoyast=#{node_url}/autoyast.xml" | ||
if node[:provisioner][:use_serial_console] | ||
append << "textmode=1" | ||
end | ||
append << "ifcfg=dhcp4 netwait=60" | ||
append << "squash=0" # workaround bsc#962397 | ||
append << "autoupgrade=1" if mnode[:state] == "os-upgrading" | ||
append << "self_update" if do_self_update | ||
|
||
target_platform_distro = os.gsub(/-.*$/, "") | ||
target_platform_version = os.gsub(/^.*-/, "") | ||
|
@@ -350,6 +363,8 @@ def find_node_boot_mac_addresses(node, admin_data_net) | |
web_port: web_port, | ||
packages: packages, | ||
repos: repos, | ||
do_self_update: do_self_update, | ||
self_update_url: expanded_self_update_url, | ||
rootpw_hash: node[:provisioner][:root_password_hash] || "", | ||
timezone: timezone, | ||
boot_device: boot_device, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
def upgrade(ta, td, a, d) | ||
a["suse"] = {} unless a.key?("suse") | ||
a["suse"]["autoyast"] = {} unless a["suse"].key?("autoyast") | ||
a["suse"]["autoyast"]["do_self_update"] = ta["suse"]["autoyast"]["do_self_update"] | ||
a["suse"]["autoyast"]["self_update_url"] = ta["suse"]["autoyast"]["self_update_url"] | ||
return a, d | ||
end | ||
|
||
def downgrade(ta, td, a, d) | ||
delete a["suse"]["autoyast"]["do_self_update"] | ||
delete a["suse"]["autoyast"]["self_update_url"] | ||
delete a["suse"]["autoyast"] if a["suse"]["autoyast"].empty? | ||
delete a["suse"] if a["suse"].empty? | ||
return a, d | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Style/LineEndConcatenation: Use \ instead of + or << to concatenate those strings.