Skip to content

Commit

Permalink
upgrade: Use cloud_version config for upgrade
Browse files Browse the repository at this point in the history
Upgrade version check was re-doing the check done for cloud_version.
Re-using this part gives added value of "passing" the override information
from `CROWBAR_CLOUD_VERSION` to upgrade subcommands.
  • Loading branch information
skazi0 committed Mar 19, 2019
1 parent 6a3465f commit 321fb76
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions lib/crowbar/client/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ def default_upgrade_versions
return "7-to-8" if File.exist?("/var/lib/crowbar/upgrade/7-to-8-upgrade-running")

# if upgrade has not been started, check the system version
os_release = Crowbar::Client::Util::OsRelease.fields

return "6-to-7" if os_release["VERSION_ID"] == "12.1"
return "6-to-7" if default_cloud_version == "6"

"7-to-8"
end
Expand Down

0 comments on commit 321fb76

Please sign in to comment.