Merge "Add tuskar API service configuration"

This commit is contained in:
Jenkins 2013-10-16 01:53:14 +00:00 committed by Gerrit Code Review
commit b3b5b60051
3 changed files with 26 additions and 0 deletions

View File

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

21
tuskar-source.yaml Normal file
View File

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

View File

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