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.

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

Jump to bottom

Sync with stable/3.0 part of the rails app for apply_role improvements #18

Open
wants to merge 16 commits into
base: stable/sap/3.0
Choose a base branch
from
Open

Sync with stable/3.0 part of the rails app for apply_role improvements #18

wants to merge 16 commits into from

Commits on Jun 20, 2017

  1. apply_role: log only when needed and at the right place 

    * log message is misleading when node list is empty
* like this it is easier to see where (on which node) chef-client failed

(cherry picked from commit a5707a8)
(cherry picked from commit e8e721b)
    @MaximilianMeister @vuntz
    MaximilianMeister authored and vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    84eeca3 View commit details
    Browse the repository at this point in the history

  2. crowbar: Some cleanup in apply_role 

    Rename variables, remove unneeded logs.

(cherry picked from commit d4ed8c5)
(cherry picked from commit f33f254)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    29aa484 View commit details
    Browse the repository at this point in the history

  3. crowbar: Fix apply_role not returning expected structure when queuing 

    (cherry picked from commit a130195)
(cherry picked from commit f0b83f3)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    0c8737e View commit details
    Browse the repository at this point in the history

  4. crowbar: Minor cleanup in ServiceObjet.apply_role 

    Don't be so complicated to build a list of nodes...

(cherry picked from commit 91741e5)
(cherry picked from commit fe8e131)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    b86960f View commit details
    Browse the repository at this point in the history

  5. crowbar: Improve debug log in ServiceObject.apply_role 

    This includes removing log lines which duplicate data already in the
debug logs.

(cherry picked from commit 8774bb2)
(cherry picked from commit a0d6671)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    03719c0 View commit details
    Browse the repository at this point in the history

  6. crowbar: Fix queue message when applying a proposal (bsc#989958) 

    There was an attempt to fix the internal API so that
ServiceObject.apply_role always returns [int, str], but this actually
breaks the UI-only path in the controller.

So revert this and document with a FIXME that this should eventually be
fixed by moving everything to [int, hash] where we will have more
freedom.

https://bugzilla.suse.com/show_bug.cgi?id=989958
(cherry picked from commit 1ad0664)
(cherry picked from commit ec17274)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    d15c4e5 View commit details
    Browse the repository at this point in the history

  7. crowbar: Refactor apply_role thanks to the "ensure" 

    We move some code that must always be run before returning in the global
ensure; this helps make sure that code is actually run in all cases.

(cherry picked from commit 7010dc7)
(cherry picked from commit 99d978f)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    e54aa77 View commit details
    Browse the repository at this point in the history

  8. crowbar: Catch exceptions in apply_role (partially fixes bsc#840255) 

    We catch all exceptions that aren't caught from this method to set the
status of the proposal to "failed", to avoid people being blocked by a
proposal staying forever in "applying".

This helps with https://bugzilla.suse.com/show_bug.cgi?id=840255

(cherry picked from commit 43bc948)
(cherry picked from commit 50ec9c0)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    e56e57a View commit details
    Browse the repository at this point in the history

  9. proposal: Add brackets around active_update params 

    This change makes the code a little bit more readable.

(cherry picked from commit 627e75b)
(cherry picked from commit 2717af2)
    @vuntz
    Rick Salevsky authored and vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    4fd053b View commit details
    Browse the repository at this point in the history

  10. crowbar: Mark the proposal as not applied on saving 

    We mark it as applied when committing, but then we never reset it to not
applied when we do a change and just save. That results in the code
assuming that the saved proposal is always the latest one.

(cherry picked from commit cefacf6)
(cherry picked from commit 09e3303)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    e327ca0 View commit details
    Browse the repository at this point in the history

  11. crowbar: Fix regression in 1ad0664, with wrong test condition 

    Was part of crowbar#560

(cherry picked from commit 7d12ecb)
(cherry picked from commit 457222b)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    32d3a80 View commit details
    Browse the repository at this point in the history

  12. crowbar: Avoid reloading nodes all the time in apply_role 

    In a few cases, we load a node just to look for some attribute that we
could have cached earlier. So let's just do that.

(cherry picked from commit 3374d9f)
(cherry picked from commit 890e720)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    188228f View commit details
    Browse the repository at this point in the history

  13. crowbar: Change ServiceObject.proposal_commit to use keyword arguments 

    We want to have more arguments, and it's going to be confusing.

(cherry picked from commit 6d69e8a)
(cherry picked from commit b31bec1)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    93525eb View commit details
    Browse the repository at this point in the history

  14. crowbar: Do not validate proposal twice on apply 

    It's done once when saving, and another time when applying.

(cherry picked from commit 50e24e2)
(cherry picked from commit 936f2c3)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    a061df2 View commit details
    Browse the repository at this point in the history

  15. crowbar: Avoid uselessly saving a node on re-allocation of IP 

    If the node already has the info, then no need to save, which is
expensive.

(cherry picked from commit 2013a47)
(cherry picked from commit 85cf951)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    e64e4a1 View commit details
    Browse the repository at this point in the history

  16. Make hound happy 

    (cherry picked from commit 1442925)
(cherry picked from commit b6b44c3)
    @vuntz
    vuntz committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    5d1b187 View commit details
    Browse the repository at this point in the history