Juju Charms Collection
swift-proxy package

Merge lp:~thedac/charms/trusty/swift-proxy/assess-ipv6-addr into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. assess-ipv6-addr
  3. Merge into next
Proposed by David Ames
Status: Merged
Merged at revision: 125
Proposed branch: lp:~thedac/charms/trusty/swift-proxy/assess-ipv6-addr
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next
Prerequisite: lp:~hopem/charms/trusty/swift-proxy/lp1510940
Diff against target: 19 lines (+10/-0)
1 file modified
lib/swift_utils.py (+10/-0)
To merge this branch: bzr merge lp:~thedac/charms/trusty/swift-proxy/assess-ipv6-addr
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: [email protected]

Description of the change

Keep the IPv6 address verification but in assess status

Contains hopem's lp:~hopem/charms/trusty/swift-proxy/lp1510940 into lp:~openstack-charmers/charms/trusty/swift-proxy/next

To post a comment you must log in.
lp:~thedac/charms/trusty/swift-proxy/assess-ipv6-addr updated
127. By David Ames

Return if ipv6 not correct

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

charm_unit_test #12363 swift-proxy-next for thedac mp276891
    UNIT OK: passed

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

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

charm_lint_check #13214 swift-proxy-next for thedac mp276891
    LINT OK: passed

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

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

charm_amulet_test #7770 swift-proxy-next for thedac mp276891
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/swift_utils.py'
2--- lib/swift_utils.py 2015-10-22 18:39:44 +0000
3+++ lib/swift_utils.py 2015-11-06 16:54:47 +0000
4@@ -1057,6 +1057,16 @@
5 status_set('blocked', 'Not enough storage zones for minimum replicas')
6 return
7
8+ if config('prefer-ipv6'):
9+ for rid in relation_ids('swift-storage'):
10+ for unit in related_units(rid):
11+ addr = relation_get(attribute='private-address', unit=unit,
12+ rid=rid)
13+ if not format_ipv6_addr(addr):
14+ status_set('blocked', 'Did not get IPv6 address from '
15+ 'storage relation (got=%s)' % (addr))
16+ return
17+
18 if relation_ids('identity-service'):
19 required_interfaces['identity'] = ['identity-service']
20

Subscribers

People subscribed via source and target branches