diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | undercloud-source.yaml | 11 | ||||
| -rw-r--r-- | undercloud-vm-ironic-source.yaml | 21 |
3 files changed, 49 insertions, 4 deletions
@@ -1,6 +1,16 @@ -overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml - # $^ won't work here because we want to list nova-compute-instance.yaml as - # a prerequisite but don't want to pass it into merge.py +generated_templates = \ + overcloud.yaml \ + undercloud-vm.yaml \ + undercloud-bm.yaml \ + undercloud-vm-tuskar.yaml \ + undercloud-vm-ironic.yaml + +# Files included in overcloud-source.yaml via FileInclude +overcloud_source_deps = nova-compute-instance.yaml + +all: $(generated_templates) + +overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps) python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ @@ -22,9 +32,12 @@ 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 $@ test: @bash test_merge.bash + +clean: + rm -f $(generated_templates) diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 35a017e6..6431dfd4 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -57,6 +57,15 @@ Resources: UserName: Ref: User Type: AWS::IAM::AccessKey + CompletionCondition: + Type: AWS::CloudFormation::WaitCondition + DependsOn: undercloud + Properties: + Handle: {Ref: CompletionHandle} + Count: '1' + Timeout: '1800' + CompletionHandle: + Type: AWS::CloudFormation::WaitConditionHandle User: Properties: Policies: @@ -86,6 +95,8 @@ Resources: cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' + completion-handle: + Ref: CompletionHandle db-password: unset glance: backend: file 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 |