From 2fcc443bf2d00dc04d7bab831ea0b55e52a5656a Mon Sep 17 00:00:00 2001 From: Chris Krelle Date: Fri, 30 Aug 2013 11:46:46 -0700 Subject: [PATCH] Add Ironic-source.yaml Mergeable Ironic yaml template. Makefile updated to create a undercloud-vm-ironic template. This patch will allow Ironic developers to include Ironic in the undercloud vm. Change-Id: Ie3998336a12f3509742634e59de5c9bee922d579 --- Makefile | 4 ++++ ironic-source.yaml | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 ironic-source.yaml diff --git a/Makefile b/Makefile index 0d7d3f84..52d65efb 100644 --- a/Makefile +++ b/Makefile @@ -6,5 +6,9 @@ undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml python merge.py $^ > $@.tmp mv $@.tmp $@ +undercloud-vm-ironic.yaml: undercloud-vm.yaml ironic-source.yaml + python merge.py $^ > $@.tmp + mv $@.tmp $@ + test: @bash test_merge.bash diff --git a/ironic-source.yaml b/ironic-source.yaml new file mode 100644 index 00000000..bd23e615 --- /dev/null +++ b/ironic-source.yaml @@ -0,0 +1,10 @@ +Description: 'Ironic: Bare Metal provisioning, API and Conductor services.' +Resources: + ironic: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + OpenStack::Role: notcomputeConfig + ironic: + db: mysql://ironic:unset@localhost/ironic + service-password: {Ref: AdminPassword} + -- 2.16.6