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
This commit is contained in:
Tomas Sedovic 2014-06-04 12:16:24 +02:00
parent af8767a644
commit a3e83c8cff
3 changed files with 0 additions and 27 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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