lp://qastaging/~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Created by
Liam Young
and last modified
- Get this branch:
- bzr branch lp://qastaging/~gnuoy/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Only
Liam Young
can upload to this branch. If you are
Liam Young
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
at
revision 55
- Liam Young (community): Approve
-
Diff: 451 lines (+160/-69)10 files modifiedhooks/charmhelpers/contrib/charmsupport/nrpe.py (+94/-5)
hooks/charmhelpers/contrib/charmsupport/rsync.py (+0/-32)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+1/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+8/-2)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+6/-0)
hooks/charmhelpers/fetch/__init__.py (+8/-1)
hooks/swift_storage_hooks.py (+12/-27)
hooks/swift_storage_utils.py (+24/-0)
Branch information
- Owner:
- Liam Young
- Status:
- Development
Recent revisions
- 59. By Liam Young
-
hooks/charmhelp
ers/contrib/ charmsupport/ rsync.py was removed after a charmhelper sync. It looks like it was never actually in lp:charm-helpers and the recent addition of contrib. charmsupport to charm-helpers- hooks.yaml and subsequent sync caused it to be (correctly) removed. I've added the lost function setup_rsync to swift_storage_ utils.py - 54. By Brad Marshall
-
[bradm] Fixed rsync to use /etc/rsync-juju.d, check if host_context is defined before using it
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)