summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-01-14 18:06:50 +0000
committerGerrit Code Review <review@openstack.org>2014-01-14 18:06:50 +0000
commit9e75c7e46022db0b6d9370701883e63ae455b759 (patch)
tree4a2aef4d6d45a432ba1886275b90ae179d9b55bf
parent7bd5d382e9eeacbdfe57e4df4596562626258bae (diff)
parent47cd2aeca9d999d3e903fc325851cda515e463ef (diff)
Merge "Add undercloud-vm-ironic-source yaml file"
-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 7da02219..a11a1089 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,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