Merge lp:~hopem/charms/trusty/ceph-osd/lp1523871 into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next

[Edward Hope-Morley]

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

charm_lint_check #128 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/128/

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

charm_unit_test #130 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/130/

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

charm_amulet_test #15 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/15/

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

charm_lint_check #149 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/149/

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

charm_unit_test #142 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/142/

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

charm_amulet_test #89 ceph-osd-next for hopem mp284937
    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/15016055/
Build: http://10.245.162.36:8080/job/charm_amulet_test/89/

[lp:~hopem/charms/trusty/ceph-osd/lp1523871]

62. By Edward Hope-Morley on 2016-02-18

post-review fixes

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

charm_unit_test #731 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/731/

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

charm_lint_check #828 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/828/

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

charm_amulet_test #328 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/328/

[lp:~hopem/charms/trusty/ceph-osd/lp1523871]

63. By Edward Hope-Morley on 2016-02-18

remove unused function

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

charm_unit_test #751 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/751/

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

charm_lint_check #848 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/848/

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

charm_amulet_test #346 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/346/

=== modified file 'config.yaml'
--- config.yaml	2016-01-13 12:48:57 +0000
+++ config.yaml	2016-02-18 17:11:23 +0000
@@ -107,12 +107,18 @@
     description: |
       The IP address and netmask of the public (front-side) network (e.g.,
       192.168.0.0/24)
+      .
+      If multiple networks are to be used, a space-delimited list of a.b.c.d/x
+      can be provided.
   ceph-cluster-network:
     type: string
     default:
     description: |
       The IP address and netmask of the cluster (back-side) network (e.g.,
       192.168.0.0/24)
+      .
+      If multiple networks are to be used, a space-delimited list of a.b.c.d/x
+      can be provided.
   prefer-ipv6:
     type: boolean
     default: False

=== modified file 'hooks/ceph_hooks.py'
--- hooks/ceph_hooks.py	2016-02-02 14:54:17 +0000
+++ hooks/ceph_hooks.py	2016-02-18 17:11:23 +0000
@@ -41,15 +41,16 @@
 from charmhelpers.core.sysctl import create as create_sysctl
 
 from utils import (
+    get_host_ip,
+    get_networks,
+    assert_charm_supports_ipv6,
     render_template,
-    get_host_ip,
-    assert_charm_supports_ipv6
 )
 
 from charmhelpers.contrib.openstack.alternatives import install_alternative
 from charmhelpers.contrib.network.ip import (
     get_ipv6_addr,
-    format_ipv6_addr
+    format_ipv6_addr,
 )
 
 from charmhelpers.contrib.charmsupport import nrpe
@@ -76,6 +77,12 @@
     mon_hosts = get_mon_hosts()
     log('Monitor hosts are ' + repr(mon_hosts))
 
+    networks = get_networks('ceph-public-network')
+    public_network = ', '.join(networks)
+
+    networks = get_networks('ceph-cluster-network')
+    cluster_network = ', '.join(networks)
+
     cephcontext = {
         'auth_supported': get_auth(),
         'mon_hosts': ' '.join(mon_hosts),
@@ -83,16 +90,16 @@
         'old_auth': cmp_pkgrevno('ceph', "0.51") < 0,
         'osd_journal_size': config('osd-journal-size'),
         'use_syslog': str(config('use-syslog')).lower(),
-        'ceph_public_network': config('ceph-public-network'),
-        'ceph_cluster_network': config('ceph-cluster-network'),
+        'ceph_public_network': public_network,
+        'ceph_cluster_network': cluster_network,
         'loglevel': config('loglevel'),
     }
 
     if config('prefer-ipv6'):
         dynamic_ipv6_address = get_ipv6_addr()[0]
-        if not config('ceph-public-network'):
+        if not public_network:
             cephcontext['public_addr'] = dynamic_ipv6_address
-        if not config('ceph-cluster-network'):
+        if not cluster_network:
             cephcontext['cluster_addr'] = dynamic_ipv6_address
 
     # Install ceph.conf as an alternative to support

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-10-01 20:11:28 +0000
+++ hooks/utils.py	2016-02-18 17:11:23 +0000
@@ -23,8 +23,8 @@
     lsb_release
 )
 
-from charmhelpers.contrib.network import ip
 from charmhelpers.contrib.network.ip import (
+    get_address_in_network,
     get_ipv6_addr
 )
 
@@ -87,10 +87,18 @@
             return answers[0].address
 
 
-@cached
-def get_public_addr():
-    return ip.get_address_in_network(config('ceph-public-network'),
-                                     fallback=get_host_ip())
+def get_networks(config_opt='ceph-public-network'):
+    """Get all configured networks from provided config option.
+
+    If public network(s) are provided, go through them and return those for
+    which we have an address configured.
+    """
+    networks = config(config_opt)
+    if networks:
+        networks = networks.split()
+        return [n for n in networks if get_address_in_network(n)]
+
+    return []
 
 
 def assert_charm_supports_ipv6():