Merge lp://qastaging/~sajoupa/charm-haproxy/update-charmhelpers into lp://qastaging/charm-haproxy
Proposed by
Laurent Sesquès
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 110 | ||||
| Proposed branch: | lp://qastaging/~sajoupa/charm-haproxy/update-charmhelpers | ||||
| Merge into: | lp://qastaging/charm-haproxy | ||||
| Diff against target: |
4542 lines (+2685/-887) 33 files modified
charm-helpers.yaml (+2/-1) hooks/charmhelpers/__init__.py (+11/-13) hooks/charmhelpers/contrib/__init__.py (+11/-13) hooks/charmhelpers/contrib/charmsupport/__init__.py (+11/-13) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+106/-34) hooks/charmhelpers/contrib/charmsupport/volumes.py (+11/-13) hooks/charmhelpers/core/__init__.py (+11/-13) hooks/charmhelpers/core/decorators.py (+11/-13) hooks/charmhelpers/core/files.py (+43/-0) hooks/charmhelpers/core/fstab.py (+11/-13) hooks/charmhelpers/core/hookenv.py (+448/-63) hooks/charmhelpers/core/host.py (+625/-155) hooks/charmhelpers/core/host_factory/centos.py (+56/-0) hooks/charmhelpers/core/host_factory/ubuntu.py (+56/-0) hooks/charmhelpers/core/hugepage.py (+69/-0) hooks/charmhelpers/core/kernel.py (+72/-0) hooks/charmhelpers/core/kernel_factory/centos.py (+17/-0) hooks/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0) hooks/charmhelpers/core/services/__init__.py (+11/-13) hooks/charmhelpers/core/services/base.py (+52/-30) hooks/charmhelpers/core/services/helpers.py (+42/-19) hooks/charmhelpers/core/strutils.py (+41/-13) hooks/charmhelpers/core/sysctl.py (+11/-13) hooks/charmhelpers/core/templating.py (+40/-24) hooks/charmhelpers/core/unitdata.py (+72/-31) hooks/charmhelpers/fetch/__init__.py (+46/-296) hooks/charmhelpers/fetch/archiveurl.py (+19/-15) hooks/charmhelpers/fetch/bzrurl.py (+48/-50) hooks/charmhelpers/fetch/centos.py (+171/-0) hooks/charmhelpers/fetch/giturl.py (+37/-39) hooks/charmhelpers/fetch/snap.py (+122/-0) hooks/charmhelpers/fetch/ubuntu.py (+364/-0) hooks/charmhelpers/osplatform.py (+25/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~sajoupa/charm-haproxy/update-charmhelpers | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Donato (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Updating charmhelpers, which should now set the nrpe relation "primary" key to True.
To post a comment you must log in.
Revision history for this message
| Laurent Sesquès (sajoupa) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tested successfully that the charm builds, deploys, and sets its nrpe-external-
$ bzr branch lp:~sajoupa/charm-haproxy/update-charmhelpers charm-haproxy
$ cd charm-haproxy
$ charm build
$ cd builds
$ juju deploy ./haproxy
$ juju deploy cs:nrpe
$ juju add-relation haproxy:
$ juju run --unit haproxy/0 "relation-ids nrpe-external-
nrpe-external-
$ juju run --unit nrpe/0 "relation-get -r nrpe-external-
True