[Bug 1571347] Fix merged to charm-heat (master)

[OpenStack Infra]

Reviewed:  https://review.openstack.org/330417
Committed: https://git.openstack.org/cgit/openstack/charm-heat/commit/?id=d8c94406f411548ded22885104ab532c1970187f
Submitter: Jenkins
Branch:    master

commit d8c94406f411548ded22885104ab532c1970187f
Author: Liam Young <liam.young at canonical.com>
Date:   Thu Jun 16 09:41:28 2016 +0000

    Update heat.conf template for mitaka compatability
    
    The format of keystone_authtoken section changed for Mitaka.
    This change creates a new template for mitaka and above.
    
    Update amulet tests to requests 2G of memory for heat instance
    as CI continually failed due to memory allocation issues.
    
    Change-Id: Ie2670f3b68fec29867d510a50a2c5dd4b31836ab
    Partial-Bug: 1571347

-- 
You received this bug notification because you are a member of Ubuntu
OpenStack, which is subscribed to cinder in Juju Charms Collection.
Matching subscriptions: charm-bugs
https://bugs.launchpad.net/bugs/1571347

Title:
  Main config keystone-authtoken section is incompatible with keystone
  v3 on mitaka

Status in Charm Helpers:
  Fix Released
Status in cinder package in Juju Charms Collection:
  Fix Released
Status in glance package in Juju Charms Collection:
  Fix Released
Status in heat package in Juju Charms Collection:
  In Progress
Status in neutron-api package in Juju Charms Collection:
  Fix Released
Status in neutron-gateway package in Juju Charms Collection:
  Fix Released
Status in nova-cloud-controller package in Juju Charms Collection:
  Fix Released
Status in nova-compute package in Juju Charms Collection:
  Fix Released

Bug description:
  The keystone_auth section has changed for Mitaka. The Liberty format
  which is currently being used is  incompatible with keystone v3 on
  mitaka as it assumes the id of the default domain is default where as
  in Mitaka it is a random uuid.

  This change is reflected in the setup documentation:

  Mitaka:

  [keystone_authtoken]
  ...
  auth_uri = http://controller:5000
  auth_url = http://controller:35357
  memcached_servers = controller:11211
  auth_type = password
  project_domain_name = default
  user_domain_name = default
  project_name = service
  username = nova
  password = NOVA_PASS

  http://docs.openstack.org/mitaka/install-guide-ubuntu/nova-controller-
  install.html

  
  Liberty:

  [keystone_authtoken]
  ...
  auth_uri = http://controller:5000
  auth_url = http://controller:35357
  auth_plugin = password
  project_domain_id = default
  user_domain_id = default
  project_name = service
  username = nova
  password = NOVA_PASS

  http://docs.openstack.org/liberty/install-guide-ubuntu/nova-
  controller-install.html

To manage notifications about this bug go to:
https://bugs.launchpad.net/charm-helpers/+bug/1571347/+subscriptions