diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2013-10-24 11:41:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2013-10-24 11:41:18 +0000 |
| commit | 7d14e86bfd9b1f69cd5b3fa32909a04bc2b90375 (patch) | |
| tree | 545b5181fce48a4d02c9e24f81c63f2158f999a8 | |
| parent | 4671819e7e89fa320e1a2967410af044bdd1252e (diff) | |
| parent | 2fcc443bf2d00dc04d7bab831ea0b55e52a5656a (diff) | |
Merge "Add Ironic-source.yaml"
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | ironic-source.yaml | 10 |
2 files changed, 14 insertions, 0 deletions
@@ -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} + |