openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add undercloud-vm-ironic-source yaml file"

This commit is contained in:
Jenkins 2014-01-14 18:06:50 +00:00 committed by Gerrit Code Review
parent 7bd5d382e9 47cd2aeca9
commit 9e75c7e460
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 $@

21
undercloud-vm-ironic-source.yaml Normal file
View File

@ -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