From: Devananda van der Veen Date: Sat, 11 Jan 2014 07:31:44 +0000 (-0800) Subject: Add undercloud-vm-ironic-source yaml file X-Git-Tag: opnfv-6.0.0~2900^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47cd2aeca9d999d3e903fc325851cda515e463ef;p=apex-tripleo-heat-templates.git Add undercloud-vm-ironic-source yaml file Copies the undercloud-vm-source yaml file and removes portions which were particular to nova-baremetal, replacing them and paving the way for further Ironic-specific changes. Change-Id: Ied49b0f8018291a0851cf2e10d83a174cb180479 --- diff --git a/Makefile b/Makefile index b05f951a..7218381e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tusk python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ -undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-source.yaml ironic-source.yaml +undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ diff --git a/undercloud-vm-ironic-source.yaml b/undercloud-vm-ironic-source.yaml new file mode 100644 index 00000000..5b41e1a3 --- /dev/null +++ b/undercloud-vm-ironic-source.yaml @@ -0,0 +1,21 @@ +Parameters: + NeutronPublicInterface: + Default: eth0 + Description: What interface to bridge onto br-ex for network nodes. + Type: String +Resources: + undercloudConfig: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + nova: + compute_hostname: undercloud + compute_driver: ironic.driver.IronicDriver + db: mysql://nova:unset@localhost/nova + default_ephemeral_format: ext4 + host: 127.0.0.1 + metadata-proxy: false + tuning: + ram_allocation_ratio: 1.0 + reserved_host_memory_mb: 0 + service-password: + Ref: NovaPassword