summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevananda van der Veen <devananda.vdv@gmail.com>2014-01-10 23:31:44 -0800
committerDevananda van der Veen <devananda.vdv@gmail.com>2014-01-10 23:31:44 -0800
commit47cd2aeca9d999d3e903fc325851cda515e463ef (patch)
tree4de79ee926e0b35e50eb89e0f431e7dc0a79d1a2
parent5b3593cc0d2b5b51cbfb03041cfb6c3bc05f4381 (diff)
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
-rw-r--r--Makefile2
-rw-r--r--undercloud-vm-ironic-source.yaml21
2 files changed, 22 insertions, 1 deletions
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