Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2 from martinpovolny/master

fix deprecations in template XML examples and link from doc
  • Loading branch information...
commit 2933aae3a4023074b44880f7b878f576fa9d8b60 2 parents 4fc562e + fadf3ef
@blomquisg blomquisg authored
View
2  examples/deployables/README.md
@@ -4,7 +4,7 @@ The deployables in this directory are all standalone deployables meant to work
with any images. They are provided purely as simple examples of what various
types of deployables could look like.
-* [deployable-sample-no-configs.xml](https://raw.github.com/aeolusproject/audrey/master/examples/deployables/deployable-sample-inline.xml): The simplest example of a deployable, which contains a single assembly with no post-launch configuration.
+* [deployable-sample-no-configs.xml](https://raw.github.com/aeolusproject/audrey/master/examples/deployables/deployable-sample-no-configs.xml): The simplest example of a deployable, which contains a single assembly with no post-launch configuration.
* [deployable-sample-single-instance.xml](https://raw.github.com/aeolusproject/audrey/master/examples/deployables/deployable-sample-single-instance.xml): An example with a single assembly with example post-launch configuration.
View
28 examples/deployables/deployable-sample-inline.xml
@@ -59,21 +59,21 @@ for x in `env | grep "^AUDREY_VAR"`; do echo "$x"; done
values or not. -->
<!-- Only scalar parameter types are going to be supported
initially. -->
- <parameter name="service_1_param_1" type="scalar">
+ <parameter name="service_1_param_1">
<!-- Default values can be provided directly in the deployable. -->
- <value><![CDATA[value 1]]></value>
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_1_param_2" type="scalar"/>
+ <parameter name="service_1_param_2"/>
</parameters>
</service>
<service name="service2">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_2_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_2_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_2_param_2" type="scalar">
- <value><![CDATA[value 2]]></value>
+ <parameter name="service_2_param_2">
+ <value type="scalar"><![CDATA[value 2]]></value>
</parameter>
</parameters>
</service>
@@ -93,23 +93,23 @@ for x in `env | grep "^AUDREY_VAR"`; do echo "$x"; done
<service name="service3">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_3_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_3_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_3_param_2" type="scalar">
- <value><![CDATA[value 2]]></value>
+ <parameter name="service_3_param_2">
+ <value type="scalar"><![CDATA[value 2]]></value>
</parameter>
</parameters>
</service>
<service name="service4">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_4_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_4_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
<!-- Parameters can also reference "returns" from other assemblies.
In this example, Instance-2 requests the "hostname" return value from Instance-1. -->
- <parameter name="service_4_param_2" type="scalar">
+ <parameter name="service_4_param_2">
<reference assembly="Instance-1" parameter="hostname"/>
</parameter>
</parameters>
View
28 examples/deployables/deployable-sample-multi-instance.xml
@@ -40,21 +40,21 @@
values or not. -->
<!-- Only scalar parameter types are going to be supported
initially. -->
- <parameter name="service_1_param_1" type="scalar">
+ <parameter name="service_1_param_1">
<!-- Default values can be provided directly in the deployable. -->
- <value><![CDATA[value 1]]></value>
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_1_param_2" type="scalar"/>
+ <parameter name="service_1_param_2"/>
</parameters>
</service>
<service name="service2">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_2_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_2_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_2_param_2" type="scalar">
- <value><![CDATA[value 2]]></value>
+ <parameter name="service_2_param_2">
+ <value type="scalar"><![CDATA[value 2]]></value>
</parameter>
</parameters>
</service>
@@ -74,23 +74,23 @@
<service name="service3">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_3_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_3_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_3_param_2" type="scalar">
- <value><![CDATA[value 2]]></value>
+ <parameter name="service_3_param_2">
+ <value type="scalar"><![CDATA[value 2]]></value>
</parameter>
</parameters>
</service>
<service name="service4">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_4_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_4_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
<!-- Parameters can also reference "returns" from other assemblies.
In this example, Instance-2 requests the "hostname" return value from Instance-1. -->
- <parameter name="service_4_param_2" type="scalar">
+ <parameter name="service_4_param_2">
<reference assembly="Instance-1" parameter="hostname"/>
</parameter>
</parameters>
View
14 examples/deployables/deployable-sample-single-instance.xml
@@ -47,21 +47,21 @@
values or not. -->
<!-- Only scalar parameter types are going to be supported
initially. -->
- <parameter name="service_1_param_1" type="scalar">
+ <parameter name="service_1_param_1">
<!-- Default values can be provided directly in the deployable. -->
- <value><![CDATA[value 1]]></value>
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_1_param_2" type="scalar"/>
+ <parameter name="service_1_param_2"/>
</parameters>
</service>
<service name="service2">
<executable url="https://www.aeolusproject.org/redmine/attachments/download/169/start_simple"/>
<parameters>
- <parameter name="service_2_param_1" type="scalar">
- <value><![CDATA[value 1]]></value>
+ <parameter name="service_2_param_1">
+ <value type="scalar"><![CDATA[value 1]]></value>
</parameter>
- <parameter name="service_2_param_2" type="scalar">
- <value><![CDATA[value 2]]></value>
+ <parameter name="service_2_param_2">
+ <value type="scalar"><![CDATA[value 2]]></value>
</parameter>
</parameters>
</service>
Please sign in to comment.
Something went wrong with that request. Please try again.