Skip to content

Commit

Permalink
Redownload migrated provisioner proposal instead of changing old one
Browse files Browse the repository at this point in the history
If there's a migration for the provisioner barclamp, then we can't
simply copy the json from the 2.0 proposal and change repos; we have to
get a migration proposal first.
  • Loading branch information
vuntz committed Jan 28, 2014
1 parent 6e8859b commit 8c83d30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 0 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ Other remaining processes on nodes:

Require reboot of non-admin nodes?
would solve first two issues

provisioner.json edits in -post is done on non-migrated json
5 changes: 3 additions & 2 deletions lib/suse-cloud-upgrade-2.0-to-3-post
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ if test -f "$ETC_PROVISIONER_JSON"; then
if test -n "`json_read "$ETC_PROVISIONER_JSON" attributes.provisioner.suse.autoyast.repos`"; then
echo_summary "Updating repositories in provisioner configuration..."

# FIXME: works because there's no migration involved for this barclamp
cp -a "$OLD_PROVISIONER_JSON" "$NEW_PROVISIONER_JSON"
# we don't copy $OLD_PROVISIONER_JSON but redownload the json; that's
# because there might have been a migration script
crowbar provisioner proposal show default > "$NEW_PROVISIONER_JSON"

# drop bits about Cloud 2.0 repos
for repo in SUSE-Cloud-2.0-{Pool,Updates}; do
Expand Down

0 comments on commit 8c83d30

Please sign in to comment.