summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-20 17:02:29 +0000
committerGerrit Code Review <review@openstack.org>2016-09-20 17:02:29 +0000
commit0050564bf4d556d2e30338e4636b97fce80bf90d (patch)
treee1006ad210dbcc39a85fbffc52c0ae65a177122d
parent0c2065b81079dcbcee2717a4b9dab9c54b8aa157 (diff)
parent14a90d67a6444db8c519b4d0b9a3eadebe08287c (diff)
downloadheat-0050564bf4d556d2e30338e4636b97fce80bf90d.tar.gz
Merge "Use correct schema for SoftwareDeploymentGroup rolling_update" into stable/newton
-rw-r--r--heat/engine/resources/openstack/heat/software_deployment.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/heat/engine/resources/openstack/heat/software_deployment.py b/heat/engine/resources/openstack/heat/software_deployment.py
index 43d80c85f..43dabc1ba 100644
--- a/heat/engine/resources/openstack/heat/software_deployment.py
+++ b/heat/engine/resources/openstack/heat/software_deployment.py
@@ -642,6 +642,19 @@ class SoftwareDeploymentGroup(resource_group.ResourceGroup):
default=0),
}
+ update_policy_schema = {
+ resource_group.ResourceGroup.ROLLING_UPDATE: properties.Schema(
+ properties.Schema.MAP,
+ schema=rolling_update_schema,
+ support_status=support.SupportStatus(version='7.0.0')
+ ),
+ resource_group.ResourceGroup.BATCH_CREATE: properties.Schema(
+ properties.Schema.MAP,
+ schema=resource_group.ResourceGroup.batch_create_schema,
+ support_status=support.SupportStatus(version='7.0.0')
+ )
+ }
+
def get_size(self):
return len(self.properties[self.SERVERS])