Juju Charms Collection
swift-storage package

Merge lp://qastaging/~jacekn/charms/precise/swift-storage/n-e-m-with-concat into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by James Page on 2014-06-02

Status:	Superseded
Proposed branch:	lp://qastaging/~jacekn/charms/precise/swift-storage/n-e-m-with-concat
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target:	848 lines (+634/-33) 13 files modified charm-helpers.yaml (+1/-0) config.yaml (+14/-1) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+219/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0) hooks/swift_storage_hooks.py (+44/-1) hooks/swift_storage_utils.py (+18/-2) metadata.yaml (+3/-0) revision (+1/-1) scripts/check_swift_storage.py (+136/-0) templates/050-swift-storage (+24/-0) templates/rsyncd.conf (+5/-23) unit_tests/test_swift_storage_relations.py (+10/-3) unit_tests/test_swift_storage_utils.py (+3/-2)
To merge this branch:	bzr merge lp://qastaging/~jacekn/charms/precise/swift-storage/n-e-m-with-concat
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Page			Needs Information on 2014-06-19
Review via email: mp+221692@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-05-16.

This proposal has been superseded by a proposal from 2014-07-31.

Description of the change

This change adds nrpe-external-master support to the charm including basic nagios plugin

Revision history for this message

James Page (james-page) wrote on 2014-06-19:

This merge proposal appears to have more than just the nrpe support - lots of changes around how rsync is managed as well?

Was this intentional? if so I would prefer that they where split out into two MP's to make it easier to test/review.

review: Needs Information

Revision history for this message

Jacek Nykis (jacekn) wrote on 2014-06-23:

> This merge proposal appears to have more than just the nrpe support - lots of
> changes around how rsync is managed as well?
>
> Was this intentional? if so I would prefer that they where split out into two
> MP's to make it easier to test/review.

Hi James,

Yes it was intentional. The swift-storage charm assumed full control over rsync config which could lead to broken configuration when used with subordinate charms.

So the rsync management changes are prerequisite for n-e-m support because n-e-m needs to be able to add rsync stanzas to the config without destroying swift config (and the swift charm needs to be able to update its config without breaking n-e-m config)

Unmerged revisions

31. By Jacek Nykis on 2014-05-16: Fixed tests
30. By Jacek Nykis on 2014-05-15: Added rsync fragment concatenation to the config-changed hook
29. By Ryan Finnie on 2014-05-14: Enable /etc/rsyncd.d functionality for compatibility with basenode
28. By Jacek Nykis on 2014-05-13: Fixed bug in check_swift_storage.py
27. By Jacek Nykis on 2014-05-13: Added nrpe-external-master hook support