lp:~1chb1n/charms/trusty/keystone/amulet-fix-lp1440950
- Get this branch:
- bzr branch lp:~1chb1n/charms/trusty/keystone/amulet-fix-lp1440950
Branch merges
- Corey Bryant (community): Approve
-
Diff: 715 lines (+386/-103)10 files modifiedhooks/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
hooks/charmhelpers/contrib/openstack/context.py (+149/-5)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+13/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
hooks/charmhelpers/contrib/openstack/utils.py (+132/-69)
hooks/charmhelpers/core/hookenv.py (+14/-1)
hooks/charmhelpers/core/unitdata.py (+1/-1)
tests/basic_deployment.py (+13/-9)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
Related bugs
Related blueprints
Branch information
- Owner:
- Ryan Beisner
- Status:
- Development
Recent revisions
- 139. By Ryan Beisner
-
cherry pick amulet fix from coreycb lp:~corey.bryant/charms/trusty/keystone/git
- 138. By James Page
-
[gnuoy,
r=james- page] Add configuration option to allow token expiry to be set Defaults to 3600 seconds.
Also synced kilo template with icehouse to pickup pki changes.
- 136. By Liam Young
-
[hopem, r=gnuoy] A previous commit had removed auth_host and service_host from
the peer relation due to races with resolve_address(). If
we do not place this data on the peer relation we actually
break endpoints that use openstack.context. IdentityService Context
which expects *any* keystone relation unit to be able to provide
a complete set of valid settings...which are propagated by the
peer relation and re-propagated to the keystone relations. - 132. By Edward Hope-Morley
-
[hopem,r=gnuoy]
Fixes import error for versions of python-
keystoneclient < Icehouse Closes-Bug: 1423579
- 131. By Edward Hope-Morley
-
[hopem,r=wolsen]
Fixes SSL cert/key inject from config.
Closes-Bug: 1351401
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)