From fcbead3871c995f4da423c9fffe9ed444407a5ce Mon Sep 17 00:00:00 2001 From: Roman Podolyaka Date: Fri, 11 Oct 2013 17:54:09 +0300 Subject: Make LaunchConfiguration resources mergeable This can be very useful for merging of Metadata to be used by optional services (e. g. to add services like tuskar to undercloud on demand). Change-Id: Ifc4016d6e994064c0772c12e668e98bf055fada9 --- examples/launchconfig1.yaml | 23 +++++++++++++++++++++ examples/launchconfig2.yaml | 19 +++++++++++++++++ examples/launchconfig_result.yaml | 43 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 examples/launchconfig1.yaml create mode 100644 examples/launchconfig2.yaml create mode 100644 examples/launchconfig_result.yaml (limited to 'examples') diff --git a/examples/launchconfig1.yaml b/examples/launchconfig1.yaml new file mode 100644 index 00000000..9127eab9 --- /dev/null +++ b/examples/launchconfig1.yaml @@ -0,0 +1,23 @@ +Parameters: + A: + Type: String + Default: test1 + B: + Type: String + Default: test2 + resource1Image: + Type: String + Default: resource1 +Resources: + notcomputeConfigBase: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + OpenStack::Role: notcomputeConfig + a: {Ref: A} + b: {Ref: B} + resource1: + Type: OS::Nova::Server + Properties: + flavor: test_flavor + image: {Ref: resource1Image} + key_name: test_key diff --git a/examples/launchconfig2.yaml b/examples/launchconfig2.yaml new file mode 100644 index 00000000..1681637b --- /dev/null +++ b/examples/launchconfig2.yaml @@ -0,0 +1,19 @@ +Parameters: + C: + Type: String + Default: test3 + resource2Image: + Type: String + Default: resource2 +Resources: + notcomputeConfigMixin: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + OpenStack::Role: notcomputeConfig + c: {Ref: C} + resource2: + Type: OS::Nova::Server + Properties: + flavor: test_flavor + image: {Ref: resource2Image} + key_name: test_key diff --git a/examples/launchconfig_result.yaml b/examples/launchconfig_result.yaml new file mode 100644 index 00000000..76c12b84 --- /dev/null +++ b/examples/launchconfig_result.yaml @@ -0,0 +1,43 @@ +Description: examples/launchconfig1.yaml,examples/launchconfig2.yaml +HeatTemplateFormatVersion: '2012-12-12' +Parameters: + A: + Default: test1 + Type: String + B: + Default: test2 + Type: String + C: + Default: test3 + Type: String + resource1Image: + Default: resource1 + Type: String + resource2Image: + Default: resource2 + Type: String +Resources: + notcomputeConfig: + Metadata: + OpenStack::Role: notcomputeConfig + a: + Ref: A + b: + Ref: B + c: + Ref: C + Type: AWS::AutoScaling::LaunchConfiguration + resource1: + Properties: + flavor: test_flavor + image: + Ref: resource1Image + key_name: test_key + Type: OS::Nova::Server + resource2: + Properties: + flavor: test_flavor + image: + Ref: resource2Image + key_name: test_key + Type: OS::Nova::Server -- cgit 1.2.3-korg