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

[Edward Hope-Morley]

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

148. By Edward Hope-Morley on 2016-02-24

update config.yaml

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

charm_unit_test #1137 ceph-mon-next for hopem mp287099
    UNIT OK: passed

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

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

charm_lint_check #1380 ceph-mon-next for hopem mp287099
    LINT OK: passed

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

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

charm_amulet_test #490 ceph-mon-next for hopem mp287099
    AMULET OK: passed

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

=== modified file 'config.yaml'
--- config.yaml	2016-01-25 16:10:14 +0000
+++ config.yaml	2016-02-24 20:59:10 +0000
@@ -70,12 +70,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-17 10:05:11 +0000
+++ hooks/ceph_hooks.py	2016-02-24 20:59:10 +0000
@@ -54,6 +54,7 @@
 from charmhelpers.core.templating import render
 
 from utils import (
+    get_networks,
     get_public_addr,
     assert_charm_supports_ipv6
 )
@@ -88,6 +89,12 @@
 
 
 def emit_cephconf():
+    networks = get_networks('ceph-public-network')
+    public_network = ', '.join(networks)
+
+    networks = get_networks('ceph-cluster-network')
+    cluster_network = ', '.join(networks)
+
     cephcontext = {
         'auth_supported': config('auth-supported'),
         'mon_hosts': ' '.join(get_mon_hosts()),
@@ -95,16 +102,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
@@ -196,10 +203,11 @@
 
 @hooks.hook('mon-relation-joined')
 def mon_relation_joined():
+    public_addr = get_public_addr()
     for relid in relation_ids('mon'):
         relation_set(relation_id=relid,
                      relation_settings={'ceph-public-address':
-                                        get_public_addr()})
+                                        public_addr})
 
 
 @hooks.hook('mon-relation-departed',
@@ -258,11 +266,12 @@
 def osd_relation(relid=None):
     if ceph.is_quorum():
         log('mon cluster in quorum - providing fsid & keys')
+        public_addr = get_public_addr()
         data = {
             'fsid': leader_get('fsid'),
             'osd_bootstrap_key': ceph.get_osd_bootstrap_key(),
             'auth': config('auth-supported'),
-            'ceph-public-address': get_public_addr(),
+            'ceph-public-address': public_addr,
         }
         relation_set(relation_id=relid,
                      relation_settings=data)
@@ -288,11 +297,12 @@
                 unit_id = unit.replace('/', '-')
                 unit_response_key = 'broker-rsp-' + unit_id
                 log('mon cluster in quorum - providing radosgw with keys')
+                public_addr = get_public_addr()
                 data = {
                     'fsid': leader_get('fsid'),
                     'radosgw_key': ceph.get_radosgw_key(),
                     'auth': config('auth-supported'),
-                    'ceph-public-address': get_public_addr(),
+                    'ceph-public-address': public_addr,
                     unit_response_key: rsp,
                 }
                 relation_set(relation_id=relid, relation_settings=data)
@@ -314,9 +324,10 @@
                 service_name = units[0].split('/')[0]
 
         if service_name is not None:
+            public_addr = get_public_addr()
             data = {'key': ceph.get_named_key(service_name),
                     'auth': config('auth-supported'),
-                    'ceph-public-address': get_public_addr()}
+                    'ceph-public-address': public_addr}
             relation_set(relation_id=relid,
                          relation_settings=data)
     else:

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-12-15 21:13:11 +0000
+++ hooks/utils.py	2016-02-24 20:59:10 +0000
@@ -12,7 +12,8 @@
 from charmhelpers.core.hookenv import (
     unit_get,
     cached,
-    config
+    config,
+    status_set,
 )
 from charmhelpers.fetch import (
     apt_install,
@@ -23,8 +24,8 @@
     lsb_release
 )
 
-from charmhelpers.contrib.network import ip
 from charmhelpers.contrib.network.ip import (
+    get_address_in_network,
     get_ipv6_addr
 )
 
@@ -71,10 +72,47 @@
             return answers[0].address
 
 
-@cached
+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 get_public_addr():
-    return ip.get_address_in_network(config('ceph-public-network'),
-                                     fallback=get_host_ip())
+    return get_network_addrs('ceph-public-network')[0]
+
+
+def get_network_addrs(config_opt):
+    """Get all configured public networks addresses.
+
+    If public network(s) are provided, go through them and return the
+    addresses we have configured on any of those networks.
+    """
+    addrs = []
+    networks = config(config_opt)
+    if networks:
+        networks = networks.split()
+        addrs = [get_address_in_network(n) for n in networks]
+        addrs = [a for a in addrs if a]
+
+    if not addrs:
+        if networks:
+            msg = ("Could not find an address on any of '%s' - resolve this "
+                   "error to retry" % (networks))
+            status_set('blocked', msg)
+            raise Exception(msg)
+        else:
+            return [get_host_ip()]
+
+    return addrs
 
 
 def assert_charm_supports_ipv6():