Merge lp:~hopem/charms/precise/rabbitmq-server/lp1281753 into lp:charms/rabbitmq-server

[Edward Hope-Morley]

[Ante Karamatić (ivoks)]

configure_sources() needs to be executed during install(), not during config_changed()

review: Needs Fixing

[lp:~hopem/charms/precise/rabbitmq-server/lp1281753]

52. By Edward Hope-Morley on 2014-02-20

[dosaboy] added support for 'source' and 'key' config options so that
          an alternative archive can be added to get more recent
          packages e.g. Ceph packages from the Ubuntu Cloud Archive.

53. By Edward Hope-Morley on 2014-02-20

[dosaboy] added support for 'source' and 'key' config options so that
          an alternative archive can be added to get more recent
          packages e.g. Ceph packages from the Ubuntu Cloud Archive.

54. By Edward Hope-Morley on 2014-03-04

[dosaboy] added support for 'source' and 'key' config options so that
          an alternative archive can be added to get more recent
          packages e.g. Ceph packages from the Ubuntu Cloud Archive.

55. By Edward Hope-Morley on 2014-03-04

[osaboy] added support for 'source' and 'key' config options so that
         an alternative archive can be added to get more recent
         packages e.g. Ceph packages from the Ubuntu Cloud Archive.

56. By Edward Hope-Morley on 2014-03-14

fixed default string values for key and source cfg options

Unmerged revisions

=== modified file 'charm-helpers.yaml'
--- charm-helpers.yaml	2014-01-16 13:47:32 +0000
+++ charm-helpers.yaml	2014-02-20 11:43:31 +0000
@@ -4,3 +4,4 @@
     - core
     - contrib.charmsupport
     - contrib.openstack
+    - fetch
\ No newline at end of file

=== modified file 'config.yaml'
--- config.yaml	2014-02-11 14:18:05 +0000
+++ config.yaml	2014-02-20 11:43:31 +0000
@@ -77,3 +77,20 @@
         rbd pool has been created, changing this value will not have any
         effect (although it can be changed in ceph by manually configuring
         your ceph cluster).
+  key:
+      type: string
+      description: |
+        Key ID to import to the apt keyring to support use with arbitary source
+        configuration from outside of Launchpad archives or PPA's.
+  source:
+      type: string
+      default: None
+      description: |
+        Optional configuration to support use of additional sources such as:
+        .
+        - ppa:myteam/ppa
+        - cloud:precise-proposed/folsom
+        - http://my.archive.com/ubuntu main
+        .
+        The last option should be used in conjunction with the key configuration
+        option.

=== modified file 'hooks/lib/utils.py'
--- hooks/lib/utils.py	2014-01-08 15:22:21 +0000
+++ hooks/lib/utils.py	2014-02-20 11:43:31 +0000
@@ -60,63 +60,6 @@
     template = templates.get_template(template_name)
     return template.render(context)
 
-CLOUD_ARCHIVE = \
-""" # Ubuntu Cloud Archive
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu {} main
-"""
-
-CLOUD_ARCHIVE_POCKETS = {
-    'folsom': 'precise-updates/folsom',
-    'folsom/updates': 'precise-updates/folsom',
-    'folsom/proposed': 'precise-proposed/folsom',
-    'grizzly': 'precise-updates/grizzly',
-    'grizzly/updates': 'precise-updates/grizzly',
-    'grizzly/proposed': 'precise-proposed/grizzly',
-    'havana': 'precise-updates/havana',
-    'havana/updates': 'precise-updates/havana',
-    'havana/proposed': 'precise-proposed/havana',
-    }
-
-
-def configure_source():
-    source = str(config_get('openstack-origin'))
-    if not source:
-        return
-    if source.startswith('ppa:'):
-        cmd = [
-            'add-apt-repository',
-            source
-            ]
-        subprocess.check_call(cmd)
-    if source.startswith('cloud:'):
-        # CA values should be formatted as cloud:ubuntu-openstack/pocket, eg:
-        #   cloud:precise-folsom/updates or cloud:precise-folsom/proposed
-        install('ubuntu-cloud-keyring')
-        pocket = source.split(':')[1]
-        pocket = pocket.split('-')[1]
-        with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
-            apt.write(CLOUD_ARCHIVE.format(CLOUD_ARCHIVE_POCKETS[pocket]))
-    if source.startswith('deb'):
-        l = len(source.split('|'))
-        if l == 2:
-            (apt_line, key) = source.split('|')
-            cmd = [
-                'apt-key',
-                'adv', '--keyserver keyserver.ubuntu.com',
-                '--recv-keys', key
-                ]
-            subprocess.check_call(cmd)
-        elif l == 1:
-            apt_line = source
-
-        with open('/etc/apt/sources.list.d/quantum.list', 'w') as apt:
-            apt.write(apt_line + "\n")
-    cmd = [
-        'apt-get',
-        'update'
-        ]
-    subprocess.check_call(cmd)
-
 # Protocols
 TCP = 'TCP'
 UDP = 'UDP'

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-02-10 09:25:06 +0000
+++ hooks/rabbitmq_server_relations.py	2014-02-20 11:43:31 +0000
@@ -20,6 +20,10 @@
 from charmhelpers.core import hookenv
 from charmhelpers.core.host import rsync
 from charmhelpers.contrib.charmsupport.nrpe import NRPE
+from charmhelpers.fetch import (
+    apt_update,
+    add_source
+)
 
 
 SERVICE_NAME = os.getenv('JUJU_UNIT_NAME').split('/')[0]
@@ -34,6 +38,10 @@
 
 
 def install():
+    # Add archive source if provided
+    add_source(utils.config_get('source'), utils.config_get('key'))
+    apt_update()
+
     pre_install_hooks()
     utils.install(*rabbit.PACKAGES)
     utils.expose(5672)
@@ -362,6 +370,10 @@
 
 
 def config_changed():
+    # Add archive source if provided
+    add_source(utils.config_get('source'), utils.config_get('key'))
+    apt_update()
+
     unison.ensure_user(user=rabbit.SSH_USER, group='rabbit')
     ensure_unison_rabbit_permissions()
 

=== modified file 'lib/charmhelpers/contrib/openstack/context.py'
--- lib/charmhelpers/contrib/openstack/context.py	2014-01-16 13:47:32 +0000
+++ lib/charmhelpers/contrib/openstack/context.py	2014-02-20 11:43:31 +0000
@@ -26,11 +26,9 @@
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
+    determine_apache_port,
     determine_api_port,
-    determine_haproxy_port,
     https,
-    is_clustered,
-    peer_units,
 )
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -67,6 +65,43 @@
     return True
 
 
+def config_flags_parser(config_flags):
+    if config_flags.find('==') >= 0:
+        log("config_flags is not in expected format (key=value)",
+            level=ERROR)
+        raise OSContextError
+    # strip the following from each value.
+    post_strippers = ' ,'
+    # we strip any leading/trailing '=' or ' ' from the string then
+    # split on '='.
+    split = config_flags.strip(' =').split('=')
+    limit = len(split)
+    flags = {}
+    for i in xrange(0, limit - 1):
+        current = split[i]
+        next = split[i + 1]
+        vindex = next.rfind(',')
+        if (i == limit - 2) or (vindex < 0):
+            value = next
+        else:
+            value = next[:vindex]
+
+        if i == 0:
+            key = current
+        else:
+            # if this not the first entry, expect an embedded key.
+            index = current.rfind(',')
+            if index < 0:
+                log("invalid config value(s) at index %s" % (i),
+                    level=ERROR)
+                raise OSContextError
+            key = current[index + 1:]
+
+        # Add to collection.
+        flags[key.strip(post_strippers)] = value.rstrip(post_strippers)
+    return flags
+
+
 class OSContextGenerator(object):
     interfaces = []
 
@@ -181,7 +216,12 @@
                     # Sufficient information found = break out!
                     break
             # Used for active/active rabbitmq >= grizzly
-            if 'clustered' not in ctxt and len(related_units(rid)) > 1:
+            if ('clustered' not in ctxt or relation_get('ha-vip-only') == 'True') and \
+               len(related_units(rid)) > 1:
+                if relation_get('ha_queues'):
+                    ctxt['rabbitmq_ha_queues'] = relation_get('ha_queues')
+                else:
+                    ctxt['rabbitmq_ha_queues'] = False
                 rabbitmq_hosts = []
                 for unit in related_units(rid):
                     rabbitmq_hosts.append(relation_get('private-address',
@@ -343,11 +383,9 @@
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
-        for ext_port in self.external_ports:
-            if peer_units() or is_clustered():
-                int_port = determine_haproxy_port(ext_port)
-            else:
-                int_port = determine_api_port(ext_port)
+        for api_port in self.external_ports:
+            ext_port = determine_apache_port(api_port)
+            int_port = determine_api_port(api_port)
             portmap = (int(ext_port), int(int_port))
             ctxt['endpoints'].append(portmap)
         return ctxt
@@ -430,6 +468,11 @@
         elif self.plugin == 'nvp':
             ctxt.update(self.nvp_ctxt())
 
+        alchemy_flags = config('neutron-alchemy-flags')
+        if alchemy_flags:
+            flags = config_flags_parser(alchemy_flags)
+            ctxt['neutron_alchemy_flags'] = flags
+
         self._save_flag_file()
         return ctxt
 
@@ -450,41 +493,7 @@
             if not config_flags:
                 return {}
 
-            if config_flags.find('==') >= 0:
-                log("config_flags is not in expected format (key=value)",
-                    level=ERROR)
-                raise OSContextError
-
-            # strip the following from each value.
-            post_strippers = ' ,'
-            # we strip any leading/trailing '=' or ' ' from the string then
-            # split on '='.
-            split = config_flags.strip(' =').split('=')
-            limit = len(split)
-            flags = {}
-            for i in xrange(0, limit - 1):
-                current = split[i]
-                next = split[i + 1]
-                vindex = next.rfind(',')
-                if (i == limit - 2) or (vindex < 0):
-                    value = next
-                else:
-                    value = next[:vindex]
-
-                if i == 0:
-                    key = current
-                else:
-                    # if this not the first entry, expect an embedded key.
-                    index = current.rfind(',')
-                    if index < 0:
-                        log("invalid config value(s) at index %s" % (i),
-                            level=ERROR)
-                        raise OSContextError
-                    key = current[index + 1:]
-
-                # Add to collection.
-                flags[key.strip(post_strippers)] = value.rstrip(post_strippers)
-
+            flags = config_flags_parser(config_flags)
             return {'user_config_flags': flags}
 
 
@@ -575,3 +584,12 @@
             ctxt['sections'] = {}
 
         return ctxt
+
+
+class SyslogContext(OSContextGenerator):
+
+    def __call__(self):
+        ctxt = {
+            'use_syslog': config('use-syslog')
+        }
+        return ctxt

=== modified file 'lib/charmhelpers/contrib/openstack/utils.py'
--- lib/charmhelpers/contrib/openstack/utils.py	2014-01-16 13:47:32 +0000
+++ lib/charmhelpers/contrib/openstack/utils.py	2014-02-20 11:43:31 +0000
@@ -415,7 +415,7 @@
     return ns_query(hostname)
 
 
-def get_hostname(address):
+def get_hostname(address, fqdn=True):
     """
     Resolves hostname for given IP, or returns the input
     if it is already a hostname.
@@ -434,7 +434,11 @@
     if not result:
         return None
 
-    # strip trailing .
-    if result.endswith('.'):
-        return result[:-1]
-    return result
+    if fqdn:
+        # strip trailing .
+        if result.endswith('.'):
+            return result[:-1]
+        else:
+            return result
+    else:
+        return result.split('.')[0]

=== modified file 'lib/charmhelpers/core/hookenv.py'
--- lib/charmhelpers/core/hookenv.py	2013-11-15 19:15:16 +0000
+++ lib/charmhelpers/core/hookenv.py	2014-02-20 11:43:31 +0000
@@ -8,6 +8,7 @@
 import json
 import yaml
 import subprocess
+import sys
 import UserDict
 from subprocess import CalledProcessError
 
@@ -149,6 +150,11 @@
     return local_unit().split('/')[0]
 
 
+def hook_name():
+    """The name of the currently executing hook"""
+    return os.path.basename(sys.argv[0])
+
+
 @cached
 def config(scope=None):
     """Juju charm configuration"""

=== modified file 'lib/charmhelpers/core/host.py'
--- lib/charmhelpers/core/host.py	2014-01-10 11:16:09 +0000
+++ lib/charmhelpers/core/host.py	2014-02-20 11:43:31 +0000
@@ -194,7 +194,7 @@
         return None
 
 
-def restart_on_change(restart_map):
+def restart_on_change(restart_map, stopstart=False):
     """Restart services based on configuration files changing
 
     This function is used a decorator, for example
@@ -219,8 +219,14 @@
             for path in restart_map:
                 if checksums[path] != file_hash(path):
                     restarts += restart_map[path]
-            for service_name in list(OrderedDict.fromkeys(restarts)):
-                service('restart', service_name)
+            services_list = list(OrderedDict.fromkeys(restarts))
+            if not stopstart:
+                for service_name in services_list:
+                    service('restart', service_name)
+            else:
+                for action in ['stop', 'start']:
+                    for service_name in services_list:
+                        service(action, service_name)
         return wrapped_f
     return wrap
 

=== modified file 'lib/charmhelpers/fetch/__init__.py'
--- lib/charmhelpers/fetch/__init__.py	2014-01-10 11:16:09 +0000
+++ lib/charmhelpers/fetch/__init__.py	2014-02-20 11:43:31 +0000
@@ -136,7 +136,7 @@
 
 def add_source(source, key=None):
     if (source.startswith('ppa:') or
-        source.startswith('http:') or
+        source.startswith('http') or
         source.startswith('deb ') or
             source.startswith('cloud-archive:')):
         subprocess.check_call(['add-apt-repository', '--yes', source])
@@ -156,7 +156,9 @@
         with open('/etc/apt/sources.list.d/proposed.list', 'w') as apt:
             apt.write(PROPOSED_POCKET.format(release))
     if key:
-        subprocess.check_call(['apt-key', 'import', key])
+        subprocess.check_call(['apt-key', 'adv', '--keyserver',
+                               'keyserver.ubuntu.com', '--recv',
+                               key])
 
 
 class SourceConfigError(Exception):