diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2013-10-16 01:53:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2013-10-16 01:53:14 +0000 |
| commit | b3b5b600511515897f529750439776355c77d564 (patch) | |
| tree | 99295006c05300df6f22f8206509a7b78aae0828 | |
| parent | ee0a83ec16d464472d0e6580272e6944530f4f9a (diff) | |
| parent | d3aa08dd5f3d82d9b4348b0341e63c42876e9c90 (diff) | |
Merge "Add tuskar API service configuration"
| -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: |