diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-06-10 20:09:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-06-10 20:09:36 +0000 |
| commit | 6dcc9e1528b3dff5279cbd17b01579f24db350ae (patch) | |
| tree | e3f74c23c318db76949bee765f1f10f1d53f4508 /Makefile | |
| parent | d230f288c4e91a11dfaf603c80df7cbafae5e5a1 (diff) | |
| parent | a3e83c8cff8d8062a7d9553595cf37c8aa5f46b8 (diff) | |
Merge "Remove the tuskar-source template"
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -3,7 +3,6 @@ generated_templates = \ overcloud-with-block-storage-nfs.yaml \ undercloud-vm.yaml \ undercloud-bm.yaml \ - undercloud-vm-tuskar.yaml \ undercloud-vm-ironic.yaml # Files included in overcloud-source.yaml via FileInclude @@ -29,10 +28,6 @@ undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-nova-config.yaml underc python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ -undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml - python ./tripleo_heat_merge/merge.py $^ > $@.tmp - mv $@.tmp $@ - undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ |