aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-09 08:25:53 +0000
committerGerrit Code Review <review@openstack.org>2015-07-09 08:25:53 +0000
commit0405a6b248a8328edc1ca050be7e33f436b29c77 (patch)
tree01bfdc7e79619286256053474b33cba0a2136293
parent6ebaadb30c3cabaae232f42306903f28627a784c (diff)
parente77d68f26a88ea0ff7b971e7fae83b575a578c94 (diff)
Merge "Add RemovalPolicies param for resource groups"
-rw-r--r--overcloud-without-mergepy.yaml38
1 files changed, 38 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index aa8e9391..4403c565 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -625,6 +625,39 @@ parameters:
Setting to a previously unused value during stack-update will trigger
package update on all nodes
+ # If you want to remove a specific node from a resource group, you can pass
+ # the node name or id as a <Group>RemovalPolicies parameter, for example:
+ # ComputeRemovalPolicies: [{'resource_list': ['0']}]
+ ControllerRemovalPolicies:
+ default: []
+ type: json
+ description: >
+ List of resources to be removed from ControllerResourceGroup when
+ doing an update which requires removal of specific resources.
+ ComputeRemovalPolicies:
+ default: []
+ type: json
+ description: >
+ List of resources to be removed from ComputeResourceGroup when
+ doing an update which requires removal of specific resources.
+ BlockStorageRemovalPolicies:
+ default: []
+ type: json
+ description: >
+ List of resources to be removed from BlockStorageResourceGroup when
+ doing an update which requires removal of specific resources.
+ ObjectStorageRemovalPolicies:
+ default: []
+ type: json
+ description: >
+ List of resources to be removed from ObjectStorageResourceGroup when
+ doing an update which requires removal of specific resources.
+ CephStorageRemovalPolicies:
+ default: []
+ type: json
+ description: >
+ List of resources to be removed from CephStorageResourceGroup when
+ doing an update which requires removal of specific resources.
resources:
@@ -647,6 +680,7 @@ resources:
depends_on: Networks
properties:
count: {get_param: ControllerCount}
+ removal_policies: {get_param: ControllerRemovalPolicies}
resource_def:
type: OS::TripleO::Controller
properties:
@@ -752,6 +786,7 @@ resources:
depends_on: Networks
properties:
count: {get_param: ComputeCount}
+ removal_policies: {get_param: ComputeRemovalPolicies}
resource_def:
type: OS::TripleO::Compute
properties:
@@ -815,6 +850,7 @@ resources:
depends_on: Networks
properties:
count: {get_param: BlockStorageCount}
+ removal_policies: {get_param: BlockStorageRemovalPolicies}
resource_def:
type: OS::TripleO::BlockStorage
properties:
@@ -850,6 +886,7 @@ resources:
depends_on: Networks
properties:
count: {get_param: ObjectStorageCount}
+ removal_policies: {get_param: ObjectStorageRemovalPolicies}
resource_def:
type: OS::TripleO::ObjectStorage
properties:
@@ -875,6 +912,7 @@ resources:
depends_on: Networks
properties:
count: {get_param: CephStorageCount}
+ removal_policies: {get_param: CephStorageRemovalPolicies}
resource_def:
type: OS::TripleO::CephStorage
properties: