diff options
-rw-r--r-- | Makefile | 19 | ||||
-rw-r--r-- | undercloud-source.yaml | 11 |
2 files changed, 27 insertions, 3 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,3 +32,6 @@ undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.ya 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 |