Merge lp:~ivoks/charms/precise/nova-cloud-controller/alchemy-flags into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Ante Karamatić]

This branch makes it possible to define sqlalchemy flags within [DATABASE] section of quantum/neutron agent plugins. This is commonly used to fine tune SQL access.

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[James Page (james-page)]

I'm assuming that this is tune things like database pool sizing, timeouts etc?

I'd actually prefer to see that exposed via specific configuration options rather than being generic - this also feels like something we should have more sane default for - I'm assuming we can make a max pool size and lazy fill it as and when required?

review: Needs Information

[Ante Karamatić (ivoks)]

Correct, it's only for database tuning.

While I agree that having better defaults would help a lot, I'm pretty sure some people would find this useful. This is oriented to devops that understand how this impacts neutron. I deliberately used 'sqlalchemy' instead of 'database' in the name, to target people who actually do understand what sqlaclchemy is.

I took the same approach we have for nova.conf. We allow various configuration flags to be set for nova, but none for neutron.

[lp:~ivoks/charms/precise/nova-cloud-controller/alchemy-flags]

63. By Ante Karamatić on 2014-04-18

Rebased on latest nova-c-c charm

Unmerged revisions

63. By Ante Karamatić on 2014-04-18

Rebased on latest nova-c-c charm

62. By Ante Karamatić on 2014-01-30

Bump revision

61. By Ante Karamatić on 2014-01-30

Add neutron-alchemy-flags functionality to nova-c-c charm

60. By Ante Karamatić on 2014-01-30

Add functionality to charm-helpers from:
  lp:~ivoks/charm-helpers/neutron-alchemy

59. By Ante Karamatić on 2014-01-30

Sync charmhelpers

=== modified file 'config.yaml'
--- config.yaml	2013-11-08 05:41:39 +0000
+++ config.yaml	2014-01-30 13:48:00 +0000
@@ -126,6 +126,12 @@
   ssl_key:
     type: string
     description: SSL key to use with certificate specified as ssl_cert.
+  neutron-alchemy-flags:
+    default: None
+    type: string
+    description: |
+      Comma separated list of key=value sqlalchemy related config flags to be
+      set in plugin ini file.
   # Neutron NVP Plugin configuration
   nvp-controllers:
     type: string

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2013-10-28 19:03:14 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-01-30 13:48:00 +0000
@@ -23,7 +23,6 @@
     unit_get,
     unit_private_ip,
     ERROR,
-    WARNING,
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
@@ -68,6 +67,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 = []
 
@@ -182,10 +218,12 @@
                     # Sufficient information found = break out!
                     break
             # Used for active/active rabbitmq >= grizzly
-            ctxt['rabbitmq_hosts'] = []
-            for unit in related_units(rid):
-                ctxt['rabbitmq_hosts'].append(relation_get('private-address',
-                                                           rid=rid, unit=unit))
+            if 'clustered' not in ctxt and len(related_units(rid)) > 1:
+                rabbitmq_hosts = []
+                for unit in related_units(rid):
+                    rabbitmq_hosts.append(relation_get('private-address',
+                                                       rid=rid, unit=unit))
+                ctxt['rabbitmq_hosts'] = ','.join(rabbitmq_hosts)
         if not context_complete(ctxt):
             return {}
         else:
@@ -286,6 +324,7 @@
 
 
 class ApacheSSLContext(OSContextGenerator):
+
     """
     Generates a context for an apache vhost configuration that configures
     HTTPS reverse proxying for one or many endpoints.  Generated context
@@ -428,33 +467,37 @@
         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
 
 
 class OSConfigFlagContext(OSContextGenerator):
-        '''
-        Responsible adding user-defined config-flags in charm config to a
-        to a template context.
-        '''
+
+        """
+        Responsible for adding user-defined config-flags in charm config to a
+        template context.
+
+        NOTE: the value of config-flags may be a comma-separated list of
+              key=value pairs and some Openstack config files support
+              comma-separated lists as values.
+        """
+
         def __call__(self):
             config_flags = config('config-flags')
-            if not config_flags or config_flags in ['None', '']:
+            if not config_flags:
                 return {}
-            config_flags = config_flags.split(',')
-            flags = {}
-            for flag in config_flags:
-                if '=' not in flag:
-                    log('Improperly formatted config-flag, expected k=v '
-                        'got %s' % flag, level=WARNING)
-                    continue
-                k, v = flag.split('=')
-                flags[k.strip()] = v
-            ctxt = {'user_config_flags': flags}
-            return ctxt
+
+            flags = config_flags_parser(config_flags)
+            return {'user_config_flags': flags}
 
 
 class SubordinateConfigContext(OSContextGenerator):
+
     """
     Responsible for inspecting relations to subordinates that
     may be exporting required config via a json blob.
@@ -495,6 +538,7 @@
         }
 
     """
+
     def __init__(self, service, config_file, interface):
         """
         :param service     : Service name key to query in any subordinate

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2013-11-06 03:48:26 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2014-01-30 13:48:00 +0000
@@ -41,6 +41,7 @@
     ('quantal', 'folsom'),
     ('raring', 'grizzly'),
     ('saucy', 'havana'),
+    ('trusty', 'icehouse')
 ])
 
 
@@ -201,7 +202,7 @@
 
 
 def import_key(keyid):
-    cmd = "apt-key adv --keyserver keyserver.ubuntu.com " \
+    cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 " \
           "--recv-keys %s" % keyid
     try:
         subprocess.check_call(cmd.split(' '))
@@ -260,6 +261,9 @@
             'havana': 'precise-updates/havana',
             'havana/updates': 'precise-updates/havana',
             'havana/proposed': 'precise-proposed/havana',
+            'icehouse': 'precise-updates/icehouse',
+            'icehouse/updates': 'precise-updates/icehouse',
+            'icehouse/proposed': 'precise-proposed/icehouse',
         }
 
         try:
@@ -411,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.
@@ -430,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 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2013-08-02 03:42:16 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2014-01-30 13:48:00 +0000
@@ -22,4 +22,4 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', block_device])
+    check_call(['sgdisk', '--zap-all', '--mbrtogpt', block_device])

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2013-11-06 03:48:26 +0000
+++ hooks/charmhelpers/core/hookenv.py	2014-01-30 13:48:00 +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 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2013-10-22 23:01:40 +0000
+++ hooks/charmhelpers/core/host.py	2014-01-30 13:48:00 +0000
@@ -245,3 +245,47 @@
     random_chars = [
         random.choice(alphanumeric_chars) for _ in range(length)]
     return(''.join(random_chars))
+
+
+def list_nics(nic_type):
+    '''Return a list of nics of given type(s)'''
+    if isinstance(nic_type, basestring):
+        int_types = [nic_type]
+    else:
+        int_types = nic_type
+    interfaces = []
+    for int_type in int_types:
+        cmd = ['ip', 'addr', 'show', 'label', int_type + '*']
+        ip_output = subprocess.check_output(cmd).split('\n')
+        ip_output = (line for line in ip_output if line)
+        for line in ip_output:
+            if line.split()[1].startswith(int_type):
+                interfaces.append(line.split()[1].replace(":", ""))
+    return interfaces
+
+
+def set_nic_mtu(nic, mtu):
+    '''Set MTU on a network interface'''
+    cmd = ['ip', 'link', 'set', nic, 'mtu', mtu]
+    subprocess.check_call(cmd)
+
+
+def get_nic_mtu(nic):
+    cmd = ['ip', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd).split('\n')
+    mtu = ""
+    for line in ip_output:
+        words = line.split()
+        if 'mtu' in words:
+            mtu = words[words.index("mtu") + 1]
+    return mtu
+
+
+def get_nic_hwaddr(nic):
+    cmd = ['ip', '-o', '-0', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd)
+    hwaddr = ""
+    words = ip_output.split()
+    if 'link/ether' in words:
+        hwaddr = words[words.index('link/ether') + 1]
+    return hwaddr

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2013-11-06 03:48:26 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2014-01-30 13:48:00 +0000
@@ -13,6 +13,7 @@
     log,
 )
 import apt_pkg
+import os
 
 CLOUD_ARCHIVE = """# Ubuntu Cloud Archive
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu {} main
@@ -43,8 +44,16 @@
     'precise-havana/updates': 'precise-updates/havana',
     'precise-updates/havana': 'precise-updates/havana',
     'havana/proposed': 'precise-proposed/havana',
-    'precies-havana/proposed': 'precise-proposed/havana',
+    'precise-havana/proposed': 'precise-proposed/havana',
     'precise-proposed/havana': 'precise-proposed/havana',
+    # Icehouse
+    'icehouse': 'precise-updates/icehouse',
+    'precise-icehouse': 'precise-updates/icehouse',
+    'precise-icehouse/updates': 'precise-updates/icehouse',
+    'precise-updates/icehouse': 'precise-updates/icehouse',
+    'icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-proposed/icehouse': 'precise-proposed/icehouse',
 }
 
 
@@ -66,8 +75,10 @@
 
 def apt_install(packages, options=None, fatal=False):
     """Install one or more packages"""
-    options = options or []
-    cmd = ['apt-get', '-y']
+    if options is None:
+        options = ['--option=Dpkg::Options::=--force-confold']
+
+    cmd = ['apt-get', '--assume-yes']
     cmd.extend(options)
     cmd.append('install')
     if isinstance(packages, basestring):
@@ -76,10 +87,14 @@
         cmd.extend(packages)
     log("Installing {} with options: {}".format(packages,
                                                 options))
+    env = os.environ.copy()
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
     if fatal:
-        subprocess.check_call(cmd)
+        subprocess.check_call(cmd, env=env)
     else:
-        subprocess.call(cmd)
+        subprocess.call(cmd, env=env)
 
 
 def apt_update(fatal=False):
@@ -93,7 +108,7 @@
 
 def apt_purge(packages, fatal=False):
     """Purge one or more packages"""
-    cmd = ['apt-get', '-y', 'purge']
+    cmd = ['apt-get', '--assume-yes', 'purge']
     if isinstance(packages, basestring):
         cmd.append(packages)
     else:
@@ -123,14 +138,16 @@
     if (source.startswith('ppa:') or
         source.startswith('http:') or
         source.startswith('deb ') or
-        source.startswith('cloud-archive:')):
+            source.startswith('cloud-archive:')):
         subprocess.check_call(['add-apt-repository', '--yes', source])
     elif source.startswith('cloud:'):
         apt_install(filter_installed_packages(['ubuntu-cloud-keyring']),
                     fatal=True)
         pocket = source.split(':')[-1]
         if pocket not in CLOUD_ARCHIVE_POCKETS:
-            raise SourceConfigError('Unsupported cloud: source option %s' % pocket)
+            raise SourceConfigError(
+                'Unsupported cloud: source option %s' %
+                pocket)
         actual_pocket = CLOUD_ARCHIVE_POCKETS[pocket]
         with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
             apt.write(CLOUD_ARCHIVE.format(actual_pocket))
@@ -220,7 +237,9 @@
 
 
 class BaseFetchHandler(object):
+
     """Base class for FetchHandler implementations in fetch plugins"""
+
     def can_handle(self, source):
         """Returns True if the source can be handled. Otherwise returns
         a string explaining why it cannot"""
@@ -248,10 +267,13 @@
     for handler_name in fetch_handlers:
         package, classname = handler_name.rsplit('.', 1)
         try:
-            handler_class = getattr(importlib.import_module(package), classname)
+            handler_class = getattr(
+                importlib.import_module(package),
+                classname)
             plugin_list.append(handler_class())
         except (ImportError, AttributeError):
             # Skip missing plugins so that they can be ommitted from
             # installation if desired
-            log("FetchHandler {} not found, skipping plugin".format(handler_name))
+            log("FetchHandler {} not found, skipping plugin".format(
+                handler_name))
     return plugin_list

=== modified file 'revision'
--- revision	2013-11-08 05:41:39 +0000
+++ revision	2014-01-30 13:48:00 +0000
@@ -1,1 +1,1 @@
-311
+312

=== modified file 'templates/folsom/ovs_quantum_plugin.ini'
--- templates/folsom/ovs_quantum_plugin.ini	2013-08-19 21:13:45 +0000
+++ templates/folsom/ovs_quantum_plugin.ini	2014-01-30 13:48:00 +0000
@@ -16,6 +16,11 @@
 {% else -%}
 connection = sqlite:////var/lib/quantum/quantum.sqlite
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 
 [SECURITYGROUP]
 {% if neutron_security_groups -%}

=== modified file 'templates/havana/ovs_neutron_plugin.ini'
--- templates/havana/ovs_neutron_plugin.ini	2013-09-25 10:49:12 +0000
+++ templates/havana/ovs_neutron_plugin.ini	2014-01-30 13:48:00 +0000
@@ -10,6 +10,11 @@
 {% else -%}
 connection = sqlite:////var/lib/neutron/neutron.sqlite
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 
 [securitygroup]
 {% if neutron_security_groups -%}