lp://staging/~corey.bryant/charms/trusty/swift-proxy/contrib.python.packages

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next at revision 68

OpenStack Charmers: Pending requested 2014-12-10

Diff: 3482 lines (+1085/-536)

33 files modified

charm-helpers-hooks.yaml (+1/-0)
hooks/charmhelpers/__init__.py (+22/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+16/-7)
hooks/charmhelpers/contrib/network/ip.py (+52/-50)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1)
hooks/charmhelpers/contrib/openstack/context.py (+319/-226)
hooks/charmhelpers/contrib/openstack/ip.py (+41/-27)
hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-2)
hooks/charmhelpers/contrib/openstack/templating.py (+5/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+146/-13)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+4/-3)
hooks/charmhelpers/contrib/python/packages.py (+77/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+89/-102)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/fstab.py (+10/-8)
hooks/charmhelpers/core/hookenv.py (+41/-15)
hooks/charmhelpers/core/host.py (+51/-20)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/core/services/helpers.py (+9/-5)
hooks/charmhelpers/core/templating.py (+2/-1)
hooks/charmhelpers/fetch/__init__.py (+18/-12)
hooks/charmhelpers/fetch/archiveurl.py (+53/-16)
hooks/charmhelpers/fetch/bzrurl.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+51/-0)
tests/charmhelpers/__init__.py (+22/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+3/-3)
tests/charmhelpers/contrib/amulet/utils.py (+6/-4)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

75. By Corey Bryant on 2014-12-11

Sync charm-helpers and actually pick up charmhelpers/__init__.py this time.

74. By Corey Bryant on 2014-12-11

Remove hooks/charmhelpers/__init__.py and re-sync charm-helpers.

73. By Corey Bryant on 2014-12-11

Remove __init__ from charm-helpers yaml.

72. By Corey Bryant on 2014-12-11

Remove .pyc files from charmhelpers/hooks.

71. By Corey Bryant on 2014-12-11

Sync charm-helpers.

70. By Corey Bryant on 2014-12-11

Add __init__ to charm-helpers sync.

69. By Corey Bryant on 2014-12-10

Sync charm-helpers.

68. By Corey Bryant on 2014-12-10

Add contrib.python.packages to charm-helpers sync.

67. By James Page on 2014-11-05

[dosaboy,r=james-page,t=osci] Refactor ring-build and distribution.

66. By Edward Hope-Morley on 2014-10-17

[jjo,r=hopem]

If a hash is not provided when deploying swift-proxy,
each unit will create it's own. This patch builds default
swift_hash from $JUJU_ENV_UUID and service_name (unless
one is provided in config)

Closes-Bug: 1337765