Juju Charms Collection
swift-storage package

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

Proposed by Gareth Woolridge on 2014-07-31

Status:	Superseded
Proposed branch:	lp://qastaging/~moon127/charms/trusty/swift-storage/n-e-m-with-concat-rebase
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target:	855 lines (+645/-32) (has conflicts) 13 files modified charm-helpers.yaml.OTHER (+12/-0) config.yaml (+14/-0) 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) Contents conflict in charm-helpers.yaml
To merge this branch:	bzr merge lp://qastaging/~moon127/charms/trusty/swift-storage/n-e-m-with-concat-rebase
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Page		2014-07-31	Pending
Review via email: mp+229029@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-06-02.

This proposal has been superseded by a proposal from 2014-08-19.

Description of the change

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

Rebase of Jacek's original change to apply cleanly to /next.

Revision history for this message

James Page (james-page) wrote on 2014-06-19: Posted in a previous version of this proposal

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: Posted in a previous version of this proposal

> 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)

Revision history for this message

Gareth Woolridge (moon127) wrote on 2014-07-31:

James,

Rebase of Jacek's earlier work to apply cleanly to /next as we needed to pull in some other updates to PS4.

Can you respond to Jacek's earlier comment above? The nagios-external-master support and rsync changes go hand in hand.

Unmerged revisions

33. By Gareth Woolridge on 2014-07-22

Rebase Jacek's nem+rsync concat changes on swift-storage/next for persistence fixes.

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