Resource type AWS::RDS::DBInstance errors

Confirming the reported via tempest, plus additional related issue due to what looks to be a missing /etc/heat/templates/ dir:

root@juju-beis0-machine-7:/etc/heat# ls -alhR
.:
total 24K
drwxr-x--- 3 heat heat 4.0K Aug 3 11:51 .
drwxr-xr-x 95 root root 4.0K Aug 3 11:52 ..
-rw-r--r-- 1 heat heat 3.2K Aug 3 11:55 api-paste.ini
drwxr-xr-x 2 heat heat 4.0K Aug 3 11:51 environment.d
-rw-r--r-- 1 heat heat 1.2K Aug 3 11:55 heat.conf
-rw-r--r-- 1 heat heat 3.0K Jun 18 22:26 policy.json

./environment.d:
total 12K
drwxr-xr-x 2 heat heat 4.0K Aug 3 11:51 .
drwxr-x--- 3 heat heat 4.0K Aug 3 11:51 ..
-rw-r--r-- 1 heat heat 436 Jun 18 22:26 default.yaml

# Trusty-Icehouse:
======================================================================
FAIL: tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show[id-0e85a483-828b-4a28-a0e3-f0a21809192b,smoke]
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  pythonlogging:''
  stderr
  stdout

Traceback (most recent call last):
  File "/var/lib/jenkins/tools/openstack-charm-testing/tempest/tempest/api/orchestration/stacks/test_resource_types.py", line 35, in test_resource_type_show
    type_schema = self.client.show_resource_type(resource_type)
  File "/var/lib/jenkins/tools/openstack-charm-testing/tempest/tempest/services/orchestration/json/orchestration_client.py", line 301, in show_resource_type
    resp, body = self.get(url)
  File "/usr/local/lib/python2.7/dist-packages/tempest_lib/common/rest_client.py", line 271, in get
    return self.request('GET', url, extra_headers, headers)
  File "/usr/local/lib/python2.7/dist-packages/tempest_lib/common/rest_client.py", line 636, in request
    resp, resp_body)
  File "/usr/local/lib/python2.7/dist-packages/tempest_lib/common/rest_client.py", line 693, in _error_checker
    raise exceptions.BadRequest(resp_body)
tempest_lib.exceptions.BadRequest: Bad request
Details: {u'title': u'Bad Request', u'explanation': u'The server could not comply with the request since it is either malformed or otherwise incorrect.', u'code': 400, u'error': {u'message': u"type object 'TemplateResource' has no attribute 'properties_schema'", u'traceback': None, u'type': u'AttributeError'}}

# Trusty-Kilo:
======================================================================
FAIL: tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show[id-0e85a483-828b-4a28-a0e3-f0a21809192b,smoke]
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  pythonlogging:''
  stderr
  stdout

Traceback (most recent call last):
  File "/var/lib/jenkins/tools/openstack-charm-testing/tempest/tempest/api/orchestration/stacks/test_resource_types.py", line 35, in test_resource_type_show
    type_schema = self.client.show_resource_type(resource_type)
  File "/var/lib/jenkins/tools/openstack-charm-testing/tempest/tempest/services/orchestration/json/orchestration_client.py", line 301, in show_resour...

root@juju-beis0-machine-7:/etc/heat/environment.d# cat default.yaml

resource_registry:
    # allow older templates with Quantum in them.
    "OS::Quantum*": "OS::Neutron*"
    # Choose your implementation of AWS::CloudWatch::Alarm
    #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
    "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm"
    "OS::Metering::Alarm": "OS::Ceilometer::Alarm"
    "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.yaml"
root@juju-beis0-machine-7:/etc/heat/environment.d#

This doesn't appear to be purely a charm issue. When I apt-get install heat-api on a fresh trusty instance, I do not have an /etc/heat/templates/ dir.

Suspect this is a packaging issue, as the package source does contain the awol items:
 http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/heat/trusty/files/head:/etc/heat/templates/

This bug was fixed in the package heat - 1:5.0.0~b1-0ubuntu4

---------------
heat (1:5.0.0~b1-0ubuntu4) wily; urgency=medium

  * d/heat-common.install: Include missing templates directory (LP: #1431013).
  * d/python-heat.install: Include missing migrate.cfg.

 -- James Page <email address hidden> Thu, 13 Aug 2015 11:31:48 +0100

Packages before Kilo also need this fix (I confirmed it on Juno Cloud Archive)

This bug was fixed in the package heat - 1:6.0.0-0ubuntu2~cloud0
---------------

 heat (1:6.0.0-0ubuntu2~cloud0) xenial-newton; urgency=medium
 .
   * New package for the Ubuntu Cloud Archive.
 .
 heat (1:6.0.0-0ubuntu2) yakkety; urgency=medium
 .
   * d/p/engine-shutdown.patch: Cherry pick fix to ensure that heat-engine
     worker processes are shutdown correctly when SIGINT is received early
     in the process lifecycle (LP: #1562042).
 .
 heat (1:6.0.0-0ubuntu1) xenial; urgency=medium
 .
   * New upstream release for OpenStack Mitaka.
 .
 heat (1:6.0.0~rc1-0ubuntu1) xenial; urgency=medium
 .
   * New upstream release candidate for OpenStack Mitaka.
   * d/control: Align (build-)depends with upstream.
 .
 heat (1:6.0.0~b3-0ubuntu1) xenial; urgency=medium
 .
   * New upstream milestone for OpenStack Mitaka.
   * d/p/use-oslo-config-fixture-for-tests.patch: Removed. Fixed upstream.
   * d/control: Align (build-)depends with upstream.
 .
 heat (1:6.0.0~b2-0ubuntu2) xenial; urgency=medium
 .
   * d/p/use-oslo-config-fixture-for-tests.patch: Cherry-picked from upstream
     master branch to fix test failures with new oslo.config versions.
 .
 heat (1:6.0.0~b2-0ubuntu1) xenial; urgency=medium
 .
   * New upstream milestone for OpenStack Mitaka.
   * d/control: Align (build-)depends with upstream.
 .
 heat (1:6.0.0~b1-0ubuntu1) xenial; urgency=medium
 .
   * New upstream milestone for OpenStack Mitaka.
   * d/control: Align (build-)depends with upstream.
   * d/p/fixup-assert-regex.patch: Rebased.
 .
 heat (1:5.0.0-0ubuntu1) wily; urgency=medium
 .
   * New upstream release for OpenStack Liberty.
 .
 heat (1:5.0.0~rc2-0ubuntu1) wily; urgency=medium
 .
   * New upstream release candidate for OpenStack Liberty.
   * Don't clean heat.egg-info ensuring that non-py resources actually
     get installed (LP: #1505444).
 .
 heat (1:5.0.0~rc1-0ubuntu1) wily; urgency=medium
 .
   * New upstream release candidate for OpenStack Liberty.
   * d/control: Align (build-)depends with upstream.
   * d/watch: Update to cope with upstream rc versioning.
   * d/rules: Drop removal of .eggs directory in override_dh_auto_clean.
   * d/control: Bump minimum pbr version to 1.8.
 .
 heat (1:5.0.0~b3-0ubuntu1) wily; urgency=medium
 .
   * New upstream milestone for OpenStack Liberty.
   * d/control: Align (build-)depends with upstream.
   * d/p/fix-dummy-resource-missing.patch: Dropped. Fixed in milestone.
   * d/p/move-extensions.patch: Dropped. Fixed in milestone.
 .
 heat (1:5.0.0~b2-0ubuntu2) wily; urgency=medium
 .
   * d/control: Add python-pymysql to (build-)depends.
   * d/p/fix-dummy-resource-missing.patch: Cherry-picked from master to fix
     failing tests.
   * d/p/move-extensions: Cherry-picked from master to fix failing tests.
 .
 heat (1:5.0.0~b2-0ubuntu1) wily; urgency=medium
 .
   * New upstream milestone for OpenStack Liberty.
   * d/control: Align (build-)depends with upstream.
   * d/p/fix-requirements.patch: Dropped. No longer needed.
   * d/p/fixup-assert-regex.patch: Rebased.
   * d/rules: Remove .eggs directory in override_dh_auto_clean.
 .
 heat (1:5.0.0~b1-0ubuntu4) wily; urgency=medium
 .
   * d/heat-common.install: Include missing templates ...