Add tuskar API service configuration

Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to
work properly.

Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51

diff --git a/Makefile b/Makefile
index 5684dee..0d7d3f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 (file)
index 0000000..0d4cc5f
--- /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 d3394c2..4e09e77 100644 (file)
--- 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: