Updated openstack/openstack
Project: openstack-dev/devstack  a4de9a9c350dc89b1a108bbecba549da0e5d6579

devstack should put admin_tenant_id in tempest.conf file while setup

Some of the test cases in tempest related to quota use
admin_tenant_name, ideally it should use admin_tenant_id.
As tempest.conf file does not contains admin_tenant_id
it should also be updated. tempest.conf file is generated
by devstack while setup of openstack, changes should be made
in devstack so as to put admin_tenant_id in tempest conf file.

Change-Id: I62baf5b1e21ebf8d3b511624c54741015b304955
Closes-Bug: #1321624
Updated openstack/openstack
Project: openstack-dev/devstack  ef837e4c7fdf551685385953dd1dc6e935f482fd

Configure heat keystone client for SSL when keystone uses SSL

When SSL is enabled in Keystone, the path to the Keystone CA file
needs to be set in ca_file in the clients_keystone section.

Change-Id: Ic324e09b42a96d0ba31e13f8e8042cb3ac24d0b6
Closes-Bug: 1324207