Skip to content
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

upgrade: Move "crowbar_upgrade_step" attribute to node role #1080

Merged
merged 1 commit into from Feb 10, 2017

Conversation

rhafer
Copy link
Contributor

@rhafer rhafer commented Feb 8, 2017

Similar to the previous "node_upgrade_state" change this is done to
prevent a race condition with a chef-client running on the node that
might overwrite "crowbar_wall".

Similar to the previous "node_upgrade_state" change this is done to
prevent a race condition with a chef-client running on the node that
might overwrite "crowbar_wall".
@rhafer
Copy link
Contributor Author

rhafer commented Feb 8, 2017

This is largely untested and requires changes on the cloud 6 branch as well as crowbar-ha.

rhafer added a commit to rhafer/crowbar-core that referenced this pull request Feb 8, 2017
This is a partial backport of
crowbar#1080 to stable/3.0

Note: This should not change any pieces related to the upgrade from
tex to stable/3.0 to avoid breaking that. That's why the there are still
a lot of reference to crowbar_wall["crowbar_upgrade_step"] left.
@@ -24,7 +24,7 @@

return unless node[:platform_family] == "suse"

upgrade_step = node["crowbar_wall"]["crowbar_upgrade_step"] || "none"
upgrade_step = node["crowbar_upgrade_step"] || "none"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need node["crowbar"] here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuchome I think you are right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is actualy correct...

@rhafer
Copy link
Contributor Author

rhafer commented Feb 9, 2017

rhafer added a commit to rhafer/crowbar-core that referenced this pull request Feb 9, 2017
This is a partial backport of
crowbar#1080 to stable/3.0

Note: This should not change any pieces related to the upgrade from
tex to stable/3.0 to avoid breaking that. That's why the there are still
a lot of reference to crowbar_wall["crowbar_upgrade_step"] left.
@rhafer rhafer removed the wip label Feb 9, 2017
rhafer added a commit to rhafer/crowbar-core that referenced this pull request Feb 9, 2017
This is a partial backport of
crowbar#1080 to stable/3.0

Note: This should not change any pieces related to the upgrade from
tex to stable/3.0 to avoid breaking that. That's why the there are still
a lot of reference to crowbar_wall["crowbar_upgrade_step"] left.
@jsuchome
Copy link
Member

For the record: that "upgrade" gating job cannot pass right now, as it would require additional 2 PR's (one on Cloud6 side) as well as pending fix for crowbarctl.

@jsuchome jsuchome merged commit de6224d into crowbar:master Feb 10, 2017
@rhafer rhafer deleted the crowbar_upgrade_step branch February 15, 2017 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants