summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTomas Sedovic <tsedovic@redhat.com>2014-06-04 12:16:24 +0200
committerTomas Sedovic <tsedovic@redhat.com>2014-06-04 12:16:24 +0200
commita3e83c8cff8d8062a7d9553595cf37c8aa5f46b8 (patch)
treef2f2675a094c58f5c0e44974f0ce7dd231a913f6 /Makefile
parentaf8767a644471d38e20915827224e5e63385756c (diff)
Remove the tuskar-source template
There is no need for a tuskar-specific undercloud template. Tuskar is installed via elements just like any other undercloud service. This template is not being used in devtest and I'm not sure it ever has been. Change-Id: I531d927b1984873b32f440d33a130788670f7cd9
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 0 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 29e25b3d..0e52519c 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $@