From: Tomas Sedovic <tsedovic@redhat.com>
Date: Wed, 4 Jun 2014 10:16:24 +0000 (+0200)
Subject: Remove the tuskar-source template
X-Git-Tag: opnfv-6.0.0~2819^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a3e83c8cff8d8062a7d9553595cf37c8aa5f46b8;p=apex-tripleo-heat-templates.git

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

diff --git a/.gitignore b/.gitignore
index 06513ac8..ae03b039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ overcloud-with-block-storage.yaml
 overcloud-with-block-storage-nfs.yaml
 undercloud-bm.yaml
 undercloud-vm.yaml
-undercloud-vm-tuskar.yaml
 undercloud-vm-ironic.yaml
 
 *.py[cod]
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 $@
diff --git a/tuskar-source.yaml b/tuskar-source.yaml
deleted file mode 100644
index 6f84292d..00000000
--- a/tuskar-source.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Parameters:
-  # NOTE(rpodolyaka): limitation of tuskar-api, see https://bugs.launchpad.net/tuskar/+bug/1235236
-  OvercloudAdminPassword:
-    Default: unset
-    Description: The password of admin user of the overcloud (required by some services in the under cloud)
-    Type: String
-  OvercloudKeystoneHost:
-    Description: The Overcloud Host running Keystone
-    Type: String
-Resources:
-  undercloudTuskarVm:
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Metadata:
-      OpenStack::Role: undercloudConfig
-      tuskar:
-        db: mysql://tuskar:unset@localhost/tuskar?charset=utf8
-        user: admin
-        tenant_name: admin
-        password: {Ref: AdminPassword}
-        overcloud-admin-password: {Ref: OvercloudAdminPassword}
-        overcloud-keystone-host: {Ref: OvercloudKeystoneHost}