From c7e13f494791fc3dbeedd2bd27e404e7560e055d Mon Sep 17 00:00:00 2001 From: Eric Kao Date: Fri, 14 Jul 2017 16:30:14 -0700 Subject: [PATCH] Split disallowed flavor policy into monitor and remediation Some users want the monitoring but not the remediation Partially implements: blueprint policy-library Partial-Bug: 1669948 Change-Id: Id14b2148f6ce41e9ffbd23d403fb4d5ebfb840da --- .../disallowed_flavors.yaml} | 8 ++++---- .../disallowed_flavors/pause_disallowed_flavors.yaml | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) rename library/{pause_disallowed_flavors.yaml => disallowed_flavors/disallowed_flavors.yaml} (57%) create mode 100644 library/disallowed_flavors/pause_disallowed_flavors.yaml diff --git a/library/pause_disallowed_flavors.yaml b/library/disallowed_flavors/disallowed_flavors.yaml similarity index 57% rename from library/pause_disallowed_flavors.yaml rename to library/disallowed_flavors/disallowed_flavors.yaml index 8b96875d8..7ae0a9b39 100644 --- a/library/pause_disallowed_flavors.yaml +++ b/library/disallowed_flavors/disallowed_flavors.yaml @@ -1,6 +1,6 @@ --- -name: PauseBadFlavors -description: "Pause any server using a flavor that is not permitted" +name: BadFlavors +description: "Error on any server using a flavor that is not permitted" rules: - comment: "User should customize this. Permitted flavors." @@ -13,5 +13,5 @@ rules: server_with_bad_flavor(id) :- nova:servers(id=id,flavor_id=flavor_id), nova:flavors(id=flavor_id, name=flavor), not permitted_flavor(flavor) - - comment: "Remediation: Pause any VM that shows up in the server_with_bad_flavor table" - rule: "execute[nova:servers.pause(id)] :- server_with_bad_flavor(id), nova:servers(id,status='ACTIVE')" \ No newline at end of file + rule: > + error(id) :- server_with_bad_flavor(id) \ No newline at end of file diff --git a/library/disallowed_flavors/pause_disallowed_flavors.yaml b/library/disallowed_flavors/pause_disallowed_flavors.yaml new file mode 100644 index 000000000..fab30f75d --- /dev/null +++ b/library/disallowed_flavors/pause_disallowed_flavors.yaml @@ -0,0 +1,12 @@ +--- +name: PauseBadFlavors +description: "Pause any server using a flavor that is not permitted" +depends-on: + - BadFlavors +rules: + - + comment: "Remediation: Pause any VM that shows up in the server_with_bad_flavor table" + rule: > + execute[nova:servers.pause(id)] :- + BadFlavors:server_with_bad_flavor(id), + nova:servers(id,status='ACTIVE')