Juju Charms Collection
keystone package

Merge lp://qastaging/~chris-gondolin/charms/trusty/keystone/ldap-fixes into lp://qastaging/charms/keystone

  1. Trusty Tahr (14.04)
  2. ldap-fixes
  3. Merge into trunk
Proposed by Chris Stratford
Status: Rejected
Rejected by: James Page
Proposed branch: lp://qastaging/~chris-gondolin/charms/trusty/keystone/ldap-fixes
Merge into: lp://qastaging/charms/keystone
Diff against target: 25116 lines (+24267/-0) (has conflicts)
145 files modified
.bzrignore (+5/-0)
.coveragerc (+7/-0)
.project (+17/-0)
.pydevproject (+9/-0)
.testr.conf (+8/-0)
Makefile (+30/-0)
README.md (+134/-0)
actions.yaml (+17/-0)
actions/actions.py (+61/-0)
actions/git_reinstall.py (+43/-0)
actions/openstack_upgrade.py (+37/-0)
charm-helpers-hooks.yaml (+18/-0)
charm-helpers-tests.yaml (+5/-0)
charmhelpers/__init__.py (+38/-0)
charmhelpers/cli/__init__.py (+191/-0)
charmhelpers/cli/benchmark.py (+36/-0)
charmhelpers/cli/commands.py (+32/-0)
charmhelpers/cli/hookenv.py (+23/-0)
charmhelpers/cli/host.py (+31/-0)
charmhelpers/cli/unitdata.py (+39/-0)
charmhelpers/contrib/__init__.py (+15/-0)
charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
charmhelpers/contrib/charmsupport/nrpe.py (+398/-0)
charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
charmhelpers/contrib/hahelpers/__init__.py (+15/-0)
charmhelpers/contrib/hahelpers/apache.py (+82/-0)
charmhelpers/contrib/hahelpers/cluster.py (+316/-0)
charmhelpers/contrib/network/__init__.py (+15/-0)
charmhelpers/contrib/network/ip.py (+458/-0)
charmhelpers/contrib/openstack/__init__.py (+15/-0)
charmhelpers/contrib/openstack/alternatives.py (+33/-0)
charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
charmhelpers/contrib/openstack/amulet/deployment.py (+301/-0)
charmhelpers/contrib/openstack/amulet/utils.py (+985/-0)
charmhelpers/contrib/openstack/context.py (+1473/-0)
charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
charmhelpers/contrib/openstack/files/check_haproxy.sh (+34/-0)
charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
charmhelpers/contrib/openstack/ip.py (+151/-0)
charmhelpers/contrib/openstack/neutron.py (+370/-0)
charmhelpers/contrib/openstack/templates/__init__.py (+18/-0)
charmhelpers/contrib/openstack/templates/ceph.conf (+21/-0)
charmhelpers/contrib/openstack/templates/git.upstart (+17/-0)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+66/-0)
charmhelpers/contrib/openstack/templates/openstack_https_frontend (+24/-0)
charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+24/-0)
charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0)
charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0)
charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
charmhelpers/contrib/openstack/templating.py (+323/-0)
charmhelpers/contrib/openstack/utils.py (+1011/-0)
charmhelpers/contrib/peerstorage/__init__.py (+269/-0)
charmhelpers/contrib/python/__init__.py (+15/-0)
charmhelpers/contrib/python/debug.py (+56/-0)
charmhelpers/contrib/python/packages.py (+130/-0)
charmhelpers/contrib/python/rpdb.py (+58/-0)
charmhelpers/contrib/python/version.py (+34/-0)
charmhelpers/contrib/storage/__init__.py (+15/-0)
charmhelpers/contrib/storage/linux/__init__.py (+15/-0)
charmhelpers/contrib/storage/linux/ceph.py (+1039/-0)
charmhelpers/contrib/storage/linux/loopback.py (+88/-0)
charmhelpers/contrib/storage/linux/lvm.py (+105/-0)
charmhelpers/contrib/storage/linux/utils.py (+71/-0)
charmhelpers/contrib/unison/__init__.py (+313/-0)
charmhelpers/core/__init__.py (+15/-0)
charmhelpers/core/decorators.py (+57/-0)
charmhelpers/core/files.py (+45/-0)
charmhelpers/core/fstab.py (+134/-0)
charmhelpers/core/hookenv.py (+978/-0)
charmhelpers/core/host.py (+658/-0)
charmhelpers/core/hugepage.py (+71/-0)
charmhelpers/core/kernel.py (+68/-0)
charmhelpers/core/services/__init__.py (+18/-0)
charmhelpers/core/services/base.py (+353/-0)
charmhelpers/core/services/helpers.py (+292/-0)
charmhelpers/core/strutils.py (+72/-0)
charmhelpers/core/sysctl.py (+56/-0)
charmhelpers/core/templating.py (+81/-0)
charmhelpers/core/unitdata.py (+521/-0)
charmhelpers/fetch/__init__.py (+464/-0)
charmhelpers/fetch/archiveurl.py (+167/-0)
charmhelpers/fetch/bzrurl.py (+68/-0)
charmhelpers/fetch/giturl.py (+68/-0)
charmhelpers/payload/__init__.py (+17/-0)
charmhelpers/payload/archive.py (+73/-0)
charmhelpers/payload/execd.py (+66/-0)
config.yaml (+334/-0)
copyright (+17/-0)
hooks/install (+20/-0)
hooks/keystone_context.py (+254/-0)
hooks/keystone_hooks.py (+651/-0)
hooks/keystone_ssl.py (+340/-0)
hooks/keystone_utils.py (+1877/-0)
hooks/manager.py (+47/-0)
icon.svg (+653/-0)
metadata.yaml (+32/-0)
requirements.txt (+12/-0)
scripts/add_to_cluster (+13/-0)
scripts/remove_from_cluster (+4/-0)
setup.cfg (+5/-0)
templates/essex/keystone.conf (+93/-0)
templates/essex/logging.conf (+39/-0)
templates/folsom/keystone.conf (+112/-0)
templates/git/logging.conf (+39/-0)
templates/grizzly/keystone.conf (+131/-0)
templates/havana/keystone.conf (+64/-0)
templates/icehouse/keystone.conf (+112/-0)
templates/icehouse/logging.conf (+43/-0)
templates/kilo/keystone.conf (+115/-0)
templates/kilo/logging.conf (+44/-0)
templates/parts/section-signing (+13/-0)
test-requirements.txt (+8/-0)
tests/014-basic-precise-icehouse (+11/-0)
tests/015-basic-trusty-icehouse (+9/-0)
tests/016-basic-trusty-juno (+11/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-trusty-liberty (+11/-0)
tests/019-basic-trusty-mitaka (+11/-0)
tests/020-basic-wily-liberty (+9/-0)
tests/021-basic-xenial-mitaka (+9/-0)
tests/050-basic-trusty-icehouse-git (+9/-0)
tests/051-basic-trusty-juno-git (+12/-0)
tests/052-basic-trusty-kilo-git (+12/-0)
tests/README (+113/-0)
tests/basic_deployment.py (+489/-0)
tests/charmhelpers/__init__.py (+38/-0)
tests/charmhelpers/contrib/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+95/-0)
tests/charmhelpers/contrib/amulet/utils.py (+818/-0)
tests/charmhelpers/contrib/openstack/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+301/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+985/-0)
tests/setup/00-setup (+17/-0)
tests/tests.yaml (+21/-0)
tox.ini (+29/-0)
unit_tests/__init__.py (+4/-0)
unit_tests/test_actions.py (+132/-0)
unit_tests/test_actions_git_reinstall.py (+93/-0)
unit_tests/test_actions_openstack_upgrade.py (+57/-0)
unit_tests/test_keystone_contexts.py (+173/-0)
unit_tests/test_keystone_hooks.py (+978/-0)
unit_tests/test_keystone_utils.py (+761/-0)
unit_tests/test_utils.py (+122/-0)
Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file .coveragerc.  Moved existing file to .coveragerc.moved.
Conflict adding file .project.  Moved existing file to .project.moved.
Conflict adding file .pydevproject.  Moved existing file to .pydevproject.moved.
Conflict adding file .testr.conf.  Moved existing file to .testr.conf.moved.
Conflict adding file Makefile.  Moved existing file to Makefile.moved.
Conflict adding file README.md.  Moved existing file to README.md.moved.
Conflict adding file actions.  Moved existing file to actions.moved.
Conflict adding file actions.yaml.  Moved existing file to actions.yaml.moved.
Conflict adding file charm-helpers-hooks.yaml.  Moved existing file to charm-helpers-hooks.yaml.moved.
Conflict adding file charm-helpers-tests.yaml.  Moved existing file to charm-helpers-tests.yaml.moved.
Conflict adding file charmhelpers.  Moved existing file to charmhelpers.moved.
Conflict adding file config.yaml.  Moved existing file to config.yaml.moved.
Conflict adding file copyright.  Moved existing file to copyright.moved.
Conflict adding file hooks.  Moved existing file to hooks.moved.
Conflict adding file icon.svg.  Moved existing file to icon.svg.moved.
Conflict adding file metadata.yaml.  Moved existing file to metadata.yaml.moved.
Conflict adding file requirements.txt.  Moved existing file to requirements.txt.moved.
Conflict adding file scripts.  Moved existing file to scripts.moved.
Conflict adding file setup.cfg.  Moved existing file to setup.cfg.moved.
Conflict adding file templates.  Moved existing file to templates.moved.
Conflict adding file test-requirements.txt.  Moved existing file to test-requirements.txt.moved.
Conflict adding file tests.  Moved existing file to tests.moved.
Conflict adding file tox.ini.  Moved existing file to tox.ini.moved.
Conflict adding file unit_tests.  Moved existing file to unit_tests.moved.
To merge this branch: bzr merge lp://qastaging/~chris-gondolin/charms/trusty/keystone/ldap-fixes
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+290401@code.qastaging.launchpad.net

Description of the change

Enabling ldap on liberty (and possibly juno and kilo) doesn't work, as it relies on two ldap packages (python-ldap and python-ldappool) that aren't installed. This tries to fix that (it can't always, as python-ldappool doesn't exist at all for precise and only in the cloud archive for trusty, but it at least tries.)

Enabling read-only ldap for the identity backend correctly skips creation of the admin user, but also skips creation of the admin project. It shouldn't - this fixes that.

Also fixes store_admin_passwd() to work with the config.yaml default of "None".

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Hi Chris

Charm development is no longer undertaken under bzr branches on launchpad; please read:

 https://github.com/openstack-charmers/openstack-community/blob/master/README.dev-charms.md

and re-target your change to the git repositories under the OpenStack project.

Unmerged revisions

205. By Chris Stratford

[chriss] Allow project creation even if identity driver is read-only ldap (as projects are resource not identity, so we still want them)

204. By Chris Stratford

[chriss] Include ldap packages (but disable them if not available). Fix store_admin_passwd() to work with config.yaml default of "None"

203. By David Ames

[1chb1n, r=thedac] wait for unit status and turn on releases for amulet tests

202. By David Ames

[tinwood,r=thedac] Fixes Bug#1526511 change pause/resume actions use (new) assess_status()

201. By James Page

Fix liberty/mitaka typo from previous test definition update batch.

200. By Liam Young

[gnuoy, r=james-page] Delete the old quantum catalogue entry if a neutron entry is present

199. By Liam Young

Update test combo definitions, remove Vivid deprecated release tests, update bundletester testplan yaml, update tests README.

198. By Corey Bryant

[corey.bryant,r=osci] Sync charm-helpers.

Enable sync of payload.archive, sync charm-helpers, and fixup unit test failures.

197. By Liam Young

[hopem, r=gnuoy] Ensure ssl certs always synced.
Partially-Closes-Bug: 1520339

196. By Liam Young

[hopem, r=gnuoy] Fix upgrade breakage whereby if upgrading from
version of charm that did not support
db-initialised peer setting db ops get stuck
waiting infinitely for db to be intialised.

Closes-Bug: 1519035

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches