diff options
author | Tomas Sedovic <tsedovic@redhat.com> | 2014-06-04 12:16:24 +0200 |
---|---|---|
committer | Tomas Sedovic <tsedovic@redhat.com> | 2014-06-04 12:16:24 +0200 |
commit | a3e83c8cff8d8062a7d9553595cf37c8aa5f46b8 (patch) | |
tree | f2f2675a094c58f5c0e44974f0ce7dd231a913f6 | |
parent | af8767a644471d38e20915827224e5e63385756c (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
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | tuskar-source.yaml | 21 |
3 files changed, 0 insertions, 27 deletions
@@ -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] @@ -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} |