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

[Edward Hope-Morley]

[Edward Hope-Morley (hopem)]

FTR this is NOT merged to /next, not sure why LP marked it as such.

[Edward Hope-Morley (hopem)]

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]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14309 swift-storage-next for hopem mp278424
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13336 swift-storage-next for hopem mp278424
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8022 swift-storage-next for hopem mp278424
    AMULET FAIL: amulet-test failed

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

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8023 swift-storage-next for hopem mp278424
    AMULET FAIL: amulet-test failed

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

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8025 swift-storage-next for hopem mp278424
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

[lp:~hopem/charms/trusty/swift-storage/support-rsync-acl]

97. By Edward Hope-Morley on 2015-11-27

fix minor nit in template

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14475 swift-storage-next for hopem mp278424
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13494 swift-storage-next for hopem mp278424
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8038 swift-storage-next for hopem mp278424
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2015-10-15 19:05:42 +0000
+++ hooks/swift_storage_hooks.py	2015-11-27 09:29:06 +0000
@@ -123,7 +123,10 @@
     if '' in [rings_url, swift_hash] or None in [rings_url, swift_hash]:
         log('swift_storage_relation_changed: Peer not ready?')
         sys.exit(0)
+
+    CONFIGS.write('/etc/rsync-juju.d/050-swift-storage.conf')
     CONFIGS.write('/etc/swift/swift.conf')
+
     fetch_swift_rings(rings_url)
 
 

=== modified file 'lib/swift_storage_context.py'
--- lib/swift_storage_context.py	2015-07-17 09:57:19 +0000
+++ lib/swift_storage_context.py	2015-11-27 09:29:06 +0000
@@ -54,15 +54,26 @@
                 out.write(_m.sub('RSYNC_ENABLE=true', default))
 
     def __call__(self):
+        ctxt = {}
         if config('prefer-ipv6'):
-            local_ip = '%s' % get_ipv6_addr()[0]
+            ctxt['local_ip'] = '%s' % get_ipv6_addr()[0]
         else:
-            local_ip = unit_private_ip()
+            ctxt['local_ip'] = unit_private_ip()
+
+        timestamps = []
+        for rid in relation_ids('swift-storage'):
+            for unit in related_units(rid):
+                settings = relation_get(unit=unit, rid=rid)
+                ts = settings.get('timestamp')
+                allowed_hosts = settings.get('rsync_allowed_hosts')
+                if allowed_hosts and ts:
+                    if not timestamps or ts > max(timestamps):
+                        ctxt['allowed_hosts'] = allowed_hosts
+
+                    timestamps.append(ts)
 
         self.enable_rsyncd()
-        return {
-            'local_ip': local_ip
-        }
+        return ctxt
 
 
 class SwiftStorageServerContext(OSContextGenerator):

=== modified file 'templates/050-swift-storage.conf'
--- templates/050-swift-storage.conf	2014-11-06 07:38:43 +0000
+++ templates/050-swift-storage.conf	2015-11-27 09:29:06 +0000
@@ -5,6 +5,9 @@
 path = /srv/node/
 read only = false
 lock file = /var/lock/account.lock
+{% if allowed_hosts -%}
+hosts allow = {{ allowed_hosts }}
+{% endif %}
 
 [container]
 uid = swift
@@ -13,6 +16,9 @@
 path = /srv/node/
 read only = false
 lock file = /var/lock/container.lock
+{% if allowed_hosts -%}
+hosts allow = {{ allowed_hosts }}
+{% endif %}
 
 [object]
 uid = swift
@@ -21,4 +27,6 @@
 path = /srv/node/
 read only = false
 lock file = /var/lock/object.lock
-
+{% if allowed_hosts -%}
+hosts allow = {{ allowed_hosts }}
+{% endif %}