From d816b1f93416670310f07f0df95bde98c60a3a46 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Tue, 11 Nov 2014 21:21:38 +0100 Subject: [PATCH] HOT reference update Run the script to import changes from the heat repository. Change-Id: Id3a93c7e7aa2099e125a692e98a3dbdab9c6e67a --- doc/hot-reference/generated/cfn.xml | 2 +- doc/hot-reference/generated/functions.xml | 5 +- doc/hot-reference/generated/openstack.xml | 115 ++++++++++++++++++++-- 3 files changed, 113 insertions(+), 9 deletions(-) diff --git a/doc/hot-reference/generated/cfn.xml b/doc/hot-reference/generated/cfn.xml index 5be8208d67..0722ca259a 100644 --- a/doc/hot-reference/generated/cfn.xml +++ b/doc/hot-reference/generated/cfn.xml @@ -63,7 +63,7 @@ under the License.--> LaunchConfigurationName - Name of LaunchConfiguration resource. + The reference to a LaunchConfiguration resource. Can be updated without replacement. Required property. diff --git a/doc/hot-reference/generated/functions.xml b/doc/hot-reference/generated/functions.xml index a89f66a989..26bcd1c4c1 100644 --- a/doc/hot-reference/generated/functions.xml +++ b/doc/hot-reference/generated/functions.xml @@ -14,7 +14,10 @@ under the License.--> CloudFormation Compatible Functions There are a number of functions that you can use to help you write -CloudFormation compatible templates. +CloudFormation compatible templates. While most CloudFormation functions are +supported in HOT version '2013-05-23', Fn::Select is the only CloudFormation +function supported in HOT templates since version '2014-10-16' which is +introduced in Juno. All of these functions (except Ref) start with Fn::.
diff --git a/doc/hot-reference/generated/openstack.xml b/doc/hot-reference/generated/openstack.xml index dab7ce1a8e..164ef47c4d 100644 --- a/doc/hot-reference/generated/openstack.xml +++ b/doc/hot-reference/generated/openstack.xml @@ -72,7 +72,7 @@ under the License.--> matching_metadata Meter should match this resource metadata (key=value) additionally to the meter_name. - Updates cause replacement. + Can be updated without replacement. Optional property, defaults to "{}". @@ -100,6 +100,56 @@ under the License.--> Optional property. + + query + + A list of query factors, each comparing a Sample attribute with a value. Implicitly combined with matching_metadata, if any. + Can be updated without replacement. + Optional property. + + List contents: + + + + * + + Updates cause replacement. + Optional property. + + Map properties: + + + + field + + Name of attribute to compare. Names of the form metadata.user_metadata.X or metadata.metering.X are equivalent to what you can address through matching_metadata; the former for Nova meters, the latter for all others. To see the attributes of your Samples, use `ceilometer --debug sample-list`. + Updates cause replacement. + Optional property. + + + + op + + Comparison operator + Updates cause replacement. + Optional property. + Allowed values: le, ge, eq, lt, gt, ne + + + + value + + String value with which to compare + Updates cause replacement. + Optional property. + + + + + + + + repeat_actions @@ -146,6 +196,7 @@ resources: meter_name: String ok_actions: [Value, Value, ...] period: Integer + query: [{"field": String, "value": String, "op": String}, {"field": String, "value": String, "op": String}, ...] repeat_actions: Boolean statistic: String threshold: Number @@ -169,6 +220,7 @@ Resources: meter_name: String ok_actions: [Value, Value, ...] period: Integer + query: [{"field": String, "value": String, "op": String}, {"field": String, "value": String, "op": String}, ...] repeat_actions: Boolean statistic: String threshold: Number @@ -192,6 +244,7 @@ Resources: "meter_name": String, "ok_actions": [Value, Value, ...], "period": Integer, + "query": [{"field": String, "value": String, "op": String}, {"field": String, "value": String, "op": String}, ...], "repeat_actions": Boolean, "statistic": String, "threshold": Number @@ -390,6 +443,14 @@ Resources: Optional property. + + scheduler_hints + + Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume. + Updates cause replacement. + Optional property. + + size @@ -540,6 +601,7 @@ resources: image: String metadata: {...} name: String + scheduler_hints: {...} size: Integer snapshot_id: String source_volid: String @@ -560,6 +622,7 @@ Resources: image: String metadata: {...} name: String + scheduler_hints: {...} size: Integer snapshot_id: String source_volid: String @@ -580,6 +643,7 @@ Resources: "image": String, "metadata": {...}, "name": String, + "scheduler_hints": {...}, "size": Integer, "snapshot_id": String, "source_volid": String, @@ -1384,7 +1448,7 @@ Resources: LaunchConfigurationName - Name of LaunchConfiguration resource. + The reference to a LaunchConfiguration resource. Can be updated without replacement. Required property. @@ -1872,6 +1936,40 @@ used for substitution can be customized by using the index_varThe length must be at least 3. + + removal_policies + + Policies for removal of resources on update + Can be updated without replacement. + Optional property, defaults to "[]". + + List contents: + + + + * + + Policy to be processed when doing an update which requires removal of specific resources. + Updates cause replacement. + Optional property. + + Map properties: + + + + resource_list + + List of resources to be removed when doing an update which requires removal of specific resources. The resource may be specified several ways: (1) The resource name, as in the nested stack, (2) The resource reference returned from get_resource in a template, as available via the 'refs' attribute Note this is destructive on update when specified; even if the count is not being reduced, and once a resource name is removed, it's name is never reused in subsequent updates + Updates cause replacement. + Optional property, defaults to "[]". + + + + + + + + resource_def @@ -1931,6 +2029,7 @@ resources: properties: count: Integer index_var: String + removal_policies: [{"resource_list": [Value, Value, ...]}, {"resource_list": [Value, Value, ...]}, ...] resource_def: {"type": String, "properties": {...}}
@@ -1944,6 +2043,7 @@ Resources: Properties: count: Integer index_var: String + removal_policies: [{"resource_list": [Value, Value, ...]}, {"resource_list": [Value, Value, ...]}, ...] resource_def: {"type": String, "properties": {...}}
@@ -1957,6 +2057,7 @@ Resources: "Properties": { "count": Integer, "index_var": String, + "removal_policies": [{"resource_list": [Value, Value, ...]}, {"resource_list": [Value, Value, ...]}, ...], "resource_def": {"type": String, "properties": {...}} } } @@ -2079,7 +2180,7 @@ DELETE) for a software component in one place. This resource is backed by the persistence layer and the API of the SoftwareConfig resource, and only adds handling for the additional 'configs' property and attribute. - Available since 2014.1 (Icehouse). + Available since 2014.2 (Juno).
Properties @@ -2714,7 +2815,7 @@ Resources:
OS::Heat::SoftwareDeployments - Available since 2014.1 (Icehouse). + Available since 2014.2 (Juno).
Properties @@ -3220,7 +3321,7 @@ Resources:
OS::Heat::StructuredDeployments - Available since 2014.1 (Icehouse). + Available since 2014.2 (Juno).
Properties @@ -6618,7 +6719,7 @@ Resources: Security group IDs to associate with this port. Can be updated without replacement. - Optional property, defaults to "[]". + Optional property. @@ -8586,7 +8687,7 @@ Resources: policies - A list of string policies to apply.Defaults to anti-affinity. + A list of string policies to apply. Defaults to anti-affinity. Updates cause replacement. Optional property, defaults to "['anti-affinity']". Allowed values: anti-affinity, affinity