lp://staging/~openstack-charmers-next/charms/trusty/keystone/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

253. By James Page on 2016-07-06

Resync charmhelpers for licensing change

The charm-helpers project have re-licensed to Apache 2.0
inline with the agreed licensing approach to intefaces,
layers and charms generally.

Resync helpers to bring charmhelpers inline with charm
codebase.

Change-Id: Icedfb79814e186290a3120d953c9077e4e4504fe

252. By James Page on 2016-07-03

Re-license charm as Apache-2.0

All contributors to this charm have agreed to the switch
from GPL v3 to Apache 2.0; switch to Apache-2.0 license
as agreed so we can move forward with official project status.

Change-Id: Iaee75f59fe51f01da18aa2703a46c3885ade73c0

251. By Liam Young on 2016-06-28

Add admin domain id to identity relation

Add the admin domain id (not name) to the data passed to clients
down the identity-service relation. Some clients (eg Horizon) require
the admin domain id for local configuration.

Change-Id: Idfbd09fa62e628958139f77b9d06f602783e3619
Partial-Bug: 1595685

250. By Corey Bryant on 2016-06-23

Sync charm-helpers for openstack-origin-git defaults.

Change-Id: I0d9b4ef5a57643bf98bba74f81b602f1f97a6ef1

249. By David Ames on 2016-06-23

DNS HA

Implement DNS high availability. Pass the correct information to
hacluster to register a DNS entry with MAAS 2.0 or greater rather
than using a virtual IP.

Charm-helpers sync to bring in DNS HA helpers

Change-Id: I62bb49fbaebdd3c787f96f4b6ad107f8e3e368a7

248. By Corey Bryant on 2016-06-16

Add defaults for openstack-origin-git config option

openstack-origin-git currently only supports YAML that specifies
the git repositories to deploy from.

This adds support for default openstack-origin-git values. The
default values supported are: icehouse, kilo, liberty, mitaka,
and master. For example: openstack-origin-git=master.

Change-Id: I03839dc0abfb7465578cbb4eedfdab5043d053e6

247. By Alex Kavanagh on 2016-06-15

Fix for multiple status-set - related to bug 1588462

This change fixes the obvious race for a status_set() between
check_optional_interfaces() and assess_status() as the later calls the former
which calls status_set(), returns the status, which is then potentially set
again by the assess_status() function. This cleans up the code so that only a
single status_set() is performed when calling assess_status().

Change-Id: I928f60967e4a7588df2b25136525391c283cda14
Related-Bug:#1588462

246. By James Page on 2016-06-14

Switch to using charm-store for amulet tests

All OpenStack charms are now directly published to the charm store
on landing; switch Amulet helper to resolve charms using the
charm store rather than bzr branches, removing the lag between
charm changes landing and being available for other charms to
use for testing.

This is also important for new layered charms where the charm must
be build and published prior to being consumable.

This patch also fixes a potential restart of apache2 when the unit
is in paused state during the execution of config-changed; this is
the root cause of the intermittent amulet test failures.

Change-Id: I90e61f5c217ae709bc30ffe16b1569b9fd2c5719

245. By Jenkins <email address hidden> on 2016-06-10

Merge "Ensure package provided apache conf is disabled"

244. By Liam Young on 2016-06-09

Add Congress to known services

There some community interest in a Congress charm. This patch adds
Congress to the list of valid services so the Congress charm can
register endpoints with keystone.

Change-Id: I0432bd9c7eddbc4499af2f2843fe6b5b69fdee18