aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile5
-rw-r--r--tuskar-source.yaml21
3 files changed, 0 insertions, 27 deletions
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 2bb095a8..3fb54d34 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}