diff options
| author |   Roman Podolyaka <rpodolyaka@mirantis.com> | 2013-10-11 17:52:55 +0300 |
|---|---|---|
| committer | Roman Podolyaka <rpodolyaka@mirantis.com> | 2013-10-14 18:31:23 +0300 |
| commit | d3aa08dd5f3d82d9b4348b0341e63c42876e9c90 (patch) | |
| tree | 83ce72cff0d0253a5b2be9582d439ad0129220fe | |
| parent | fcbead3871c995f4da423c9fffe9ed444407a5ce (diff) | |
Add tuskar API service configuration
Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to
work properly.
Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tuskar-source.yaml | 21 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 1 |
3 files changed, 26 insertions, 0 deletions
@@ -2,5 +2,9 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml python merge.py $< > $@.tmp mv $@.tmp $@ +undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml + python merge.py $^ > $@.tmp + mv $@.tmp $@ + test: @bash test_merge.bash diff --git a/tuskar-source.yaml b/tuskar-source.yaml new file mode 100644 index 00000000..0d4cc5f6 --- /dev/null +++ b/tuskar-source.yaml @@ -0,0 +1,21 @@ +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: notcomputeConfig + 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} diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index d3394c20..4e09e773 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -84,6 +84,7 @@ Resources: ImageId: '0' InstanceType: foo Metadata: + OpenStack::Role: notcomputeConfig OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: |