From bc1eea3f365ab590c16509dde39aef10d839329e Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 11 Mar 2015 16:29:50 +0100 Subject: [PATCH] Update the HOT reference guide Change-Id: If7a4aa453ab2bd0ba16291b800770d3eb233e8c3 --- doc/hot-reference/generated/openstack.xml | 132 ++++++++++++++++++++-- 1 file changed, 121 insertions(+), 11 deletions(-) diff --git a/doc/hot-reference/generated/openstack.xml b/doc/hot-reference/generated/openstack.xml index dd2d5fd682..8eac1e3c10 100644 --- a/doc/hot-reference/generated/openstack.xml +++ b/doc/hot-reference/generated/openstack.xml @@ -3485,10 +3485,10 @@ actions. signal_transport - How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. + How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. TEMP_URL_SIGNAL will create a Swift TempURL to be signaled via HTTP PUT. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. Updates cause replacement. Optional property, defaults to "CFN_SIGNAL". - Allowed values: CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL + Allowed values: CFN_SIGNAL, TEMP_URL_SIGNAL, HEAT_SIGNAL, NO_SIGNAL @@ -3620,10 +3620,10 @@ Resources: signal_transport - How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. + How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. TEMP_URL_SIGNAL will create a Swift TempURL to be signaled via HTTP PUT. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. Updates cause replacement. Optional property, defaults to "CFN_SIGNAL". - Allowed values: CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL + Allowed values: CFN_SIGNAL, TEMP_URL_SIGNAL, HEAT_SIGNAL, NO_SIGNAL @@ -4117,10 +4117,10 @@ different input_key property value can be specified. signal_transport - How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. + How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. TEMP_URL_SIGNAL will create a Swift TempURL to be signaled via HTTP PUT. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. Updates cause replacement. Optional property, defaults to "CFN_SIGNAL". - Allowed values: CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL + Allowed values: CFN_SIGNAL, TEMP_URL_SIGNAL, HEAT_SIGNAL, NO_SIGNAL @@ -4275,10 +4275,10 @@ Resources: signal_transport - How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. + How the server should signal to heat with the deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. TEMP_URL_SIGNAL will create a Swift TempURL to be signaled via HTTP PUT. HEAT_SIGNAL will allow calls to the Heat API resource-signal using the provided keystone credentials. NO_SIGNAL will result in the resource going to the COMPLETE state without waiting for any signal. Updates cause replacement. Optional property, defaults to "CFN_SIGNAL". - Allowed values: CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL + Allowed values: CFN_SIGNAL, TEMP_URL_SIGNAL, HEAT_SIGNAL, NO_SIGNAL @@ -4699,6 +4699,96 @@ Resources: "Type": "OS::Heat::WaitConditionHandle" } } +} + + +
+ + OS::Keystone::Role + Heat Template Resource for Keystone Role. + heat_template_version: 2013-05-23 + + + parameters: + + + + role_name: + + type: string +description: Keystone role name + + + + + + + resources: + + + + sample_role: + + type: OS::Keystone::Role +properties: +
+ name: {get_param: role_name} +
+ + + + + + + Available since 2015.1 (Kilo). +
+ Properties + + + name + + Name of keystone role. + Can be updated without replacement. + Optional property. + + + +
+
+ HOT Syntax + heat_template_version: 2013-05-23 +... +resources: + ... + the_resource: + type: OS::Keystone::Role + properties: + name: String +
+
+ YAML Syntax + HeatTemplateFormatVersion: '2012-12-12' +... +Resources: + ... + TheResource: + Type: OS::Keystone::Role + Properties: + name: String +
+
+ JSON Syntax + { + "AWSTemplateFormatVersion" : "2010-09-09", + ... + "Resources" : { + "TheResource": { + "Type": "OS::Keystone::Role", + "Properties": { + "name": String + } + } + } }
@@ -5362,6 +5452,7 @@ Resources: ID of an existing port with at least one IP address to associate with this floating IP. Can be updated without replacement. Optional property. + Value must be of type neutron.port @@ -5507,6 +5598,7 @@ Resources: ID of an existing port with at least one IP address to associate with this floating IP. Can be updated without replacement. Required property. + Value must be of type neutron.port @@ -8388,6 +8480,7 @@ Resources: The port, either subnet or port should be specified. Updates cause replacement. Optional property. + Value must be of type neutron.port @@ -8412,8 +8505,10 @@ Resources: DEPRECATED - Deprecated in Kilo. Use property port. + The port id, either subnet or port_id should be specified. Updates cause replacement. Optional property. + Value must be of type neutron.port @@ -8716,7 +8811,7 @@ Resources: gateway_ip - The gateway IP address. + The gateway IP address. Set to any of [ null | ~ | "" ] to create the subnet without a gateway. If omitted, the first IP address within the subnet is assigned to the gateway. Can be updated without replacement. Optional property. @@ -9532,6 +9627,7 @@ Resources:
OS::Nova::Server + Resource for Rackspace Cloud Servers.
Properties @@ -9738,6 +9834,7 @@ Resources: ID of an existing port to associate with this server. Updates cause replacement. Optional property. + Value must be of type neutron.port @@ -10086,7 +10183,7 @@ Resources: Default name or UUID of the image used to boot Hadoop nodes. Updates cause replacement. Optional property. - Value must be of type glance.image + Value must be of type sahara.image @@ -10259,7 +10356,7 @@ Resources: ID of the default image to use for the template. Updates cause replacement. Optional property. - Value must be of type glance.image + Value must be of type sahara.image @@ -10475,6 +10572,15 @@ Resources: Required property. + + image_id + + ID of the image to use for the template. + Updates cause replacement. + Optional property. + Value must be of type sahara.image + + name @@ -10594,6 +10700,7 @@ resources: flavor: String floating_ip_pool: String hadoop_version: String + image_id: String name: String node_configs: {...} node_processes: [String, String, ...] @@ -10619,6 +10726,7 @@ Resources: flavor: String floating_ip_pool: String hadoop_version: String + image_id: String name: String node_configs: {...} node_processes: [String, String, ...] @@ -10644,6 +10752,7 @@ Resources: "flavor": String, "floating_ip_pool": String, "hadoop_version": String, + "image_id": String, "name": String, "node_configs": {...}, "node_processes": [String, String, ...], @@ -10956,6 +11065,7 @@ Resources: Name or UUID of Neutron port to attach this NIC to. Either port or network must be specified. Updates cause replacement. Optional property. + Value must be of type neutron.port