Merge lp://qastaging/~hopem/charms/trusty/swift-proxy/support-rsync-acl into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 127
Proposed branch: lp://qastaging/~hopem/charms/trusty/swift-proxy/support-rsync-acl
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 142 lines (+81/-12)
2 files modified
hooks/swift_hooks.py (+50/-11)
unit_tests/test_swift_hooks.py (+31/-1)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/swift-proxy/support-rsync-acl
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
James Page Needs Resubmitting
Review via email: mp+278775@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-11-24.

To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal

Before:
    ubuntu@dev:~$ juju ssh swift-storage-z1/0 "sudo grep 'hosts allow' /etc/rsync-juju.d/050-swift-storage.conf"
    ubuntu@dev:~$
    ubuntu@dev:~$ tmp=`mktemp -d`; rsync -var $tmp swift@`juju-deployer -f swift-storage-z1`::object; rm -rf $tmp
    2015-11-24 12:07:09 Service: swift-storage-z1 address: 10.5.16.232
    sending incremental file list
    tmp.wcuTXHLGnG/

    sent 84 bytes received 20 bytes 208.00 bytes/sec
    total size is 0 speedup is 0.00

After:
    ubuntu@dev:~$ juju ssh swift-storage-z1/0 "sudo grep 'hosts allow' /etc/rsync-juju.d/050-swift-storage.conf"
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244

    ubuntu@dev:~$ tmp=`mktemp -d`; rsync -var $tmp swift@`juju-deployer -f swift-storage-z1`::object; rm -rf $tmp
    2015-11-24 13:02:58 Service: swift-storage-z1 address: 10.5.16.242
    @ERROR: access denied to object from UNKNOWN (10.5.0.3)
    rsync error: error starting client-server protocol (code 5) at main.c(1653) [sender=3.1.0]

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #14308 swift-proxy-next for hopem mp278426
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14308/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #13337 swift-proxy-next for hopem mp278426
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13337/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #8026 swift-proxy-next for hopem mp278426
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8026/

Revision history for this message
James Page (james-page) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Edward Hope-Morley (hopem) : Posted in a previous version of this proposal
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #13495 swift-proxy-next for hopem mp278775
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13495/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #14476 swift-proxy-next for hopem mp278775
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14476/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8039 swift-proxy-next for hopem mp278775
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13525320/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8039/

Revision history for this message
James Page (james-page) :
review: Needs Resubmitting
Revision history for this message
James Page (james-page) wrote :

Amulet test failure due to security group deletion issue in juju - resubmitting.

Revision history for this message
Ryan Beisner (1chb1n) wrote : Posted in a previous version of this proposal

FYI, re-running amulet test...

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Rerunning...

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #8051 swift-proxy-next for hopem mp278426
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8051/

Revision history for this message
Liam Young (gnuoy) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches