Merge lp:~james-page/charms/trusty/swift-storage/xenial into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[James Page]

Resync helpers, fixup xenial support.

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

charm_lint_check #18391 swift-storage-next for james-page mp284515
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/14731093/
Build: http://10.245.162.77:8080/job/charm_lint_check/18391/

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

charm_unit_test #17133 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

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

charm_amulet_test #9100 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

[lp:~james-page/charms/trusty/swift-storage/xenial]

104. By James Page on 2016-02-09

Tidy lint

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

charm_lint_check #119 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_lint_check #125 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_unit_test #118 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

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

charm_amulet_test #23 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

[lp:~james-page/charms/trusty/swift-storage/xenial]

105. By James Page on 2016-02-11

Baseline

106. By James Page on 2016-02-11

Enable xenial mitaka tests

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

charm_lint_check #237 swift-storage-next for james-page mp284515
    LINT OK: passed

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

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

charm_unit_test #223 swift-storage-next for james-page mp284515
    UNIT OK: passed

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

[David Ames (thedac)]

Looks good. Waiting on amulet. With the possible exception of the xenial-mitaka amulet test which may fail due to dependencies.

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

charm_amulet_test #118 swift-storage-next for james-page mp284515
    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/15019707/
Build: http://10.245.162.36:8080/job/charm_amulet_test/118/

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

charm_amulet_test #124 swift-storage-next for james-page mp284515
    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/15022712/
Build: http://10.245.162.36:8080/job/charm_amulet_test/124/

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

charm_amulet_test #130 swift-storage-next for james-page mp284515
    AMULET OK: passed

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

=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
--- charmhelpers/contrib/openstack/amulet/deployment.py	2016-01-04 21:31:57 +0000
+++ charmhelpers/contrib/openstack/amulet/deployment.py	2016-02-11 16:47:55 +0000
@@ -121,11 +121,12 @@
 
         # Charms which should use the source config option
         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
-                      'ceph-osd', 'ceph-radosgw']
+                      'ceph-osd', 'ceph-radosgw', 'ceph-mon']
 
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
-                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
+                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
+                     'cinder-backup']
 
         if self.openstack:
             for svc in services:
 
=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-01-08 02:38:26 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-02-11 16:47:55 +0000
@@ -90,6 +90,12 @@
 from charmhelpers.contrib.openstack.utils import get_host_ip
 from charmhelpers.core.unitdata import kv
 
+try:
+    import psutil
+except ImportError:
+    apt_install('python-psutil', fatal=True)
+    import psutil
+
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
 ADDRESS_TYPES = ['admin', 'internal', 'public']
 
@@ -1258,13 +1264,11 @@
 
     @property
     def num_cpus(self):
-        try:
-            from psutil import NUM_CPUS
-        except ImportError:
-            apt_install('python-psutil', fatal=True)
-            from psutil import NUM_CPUS
-
-        return NUM_CPUS
+        # NOTE: use cpu_count if present (16.04 support)
+        if hasattr(psutil, 'cpu_count'):
+            return psutil.cpu_count()
+        else:
+            return psutil.NUM_CPUS
 
     def __call__(self):
         multiplier = config('worker-multiplier') or 0
 
=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-01-04 21:31:57 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-02-11 16:47:55 +0000
@@ -50,7 +50,7 @@
     if kernel_version() >= (3, 13):
         return []
     else:
-        return ['openvswitch-datapath-dkms']
+        return [headers_package(), 'openvswitch-datapath-dkms']
 
 
 # legacy
@@ -70,7 +70,7 @@
                                         relation_prefix='neutron',
                                         ssl_dir=QUANTUM_CONF_DIR)],
             'services': ['quantum-plugin-openvswitch-agent'],
-            'packages': [[headers_package()] + determine_dkms_package(),
+            'packages': [determine_dkms_package(),
                          ['quantum-plugin-openvswitch-agent']],
             'server_packages': ['quantum-server',
                                 'quantum-plugin-openvswitch'],
@@ -111,7 +111,7 @@
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': ['neutron-plugin-openvswitch-agent'],
-            'packages': [[headers_package()] + determine_dkms_package(),
+            'packages': [determine_dkms_package(),
                          ['neutron-plugin-openvswitch-agent']],
             'server_packages': ['neutron-server',
                                 'neutron-plugin-openvswitch'],
@@ -155,7 +155,7 @@
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
-            'packages': [[headers_package()] + determine_dkms_package(),
+            'packages': [determine_dkms_package(),
                          ['neutron-plugin-cisco']],
             'server_packages': ['neutron-server',
                                 'neutron-plugin-cisco'],
@@ -174,7 +174,7 @@
                          'neutron-dhcp-agent',
                          'nova-api-metadata',
                          'etcd'],
-            'packages': [[headers_package()] + determine_dkms_package(),
+            'packages': [determine_dkms_package(),
                          ['calico-compute',
                           'bird',
                           'neutron-dhcp-agent',
@@ -219,7 +219,7 @@
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
-            'packages': [[headers_package()] + determine_dkms_package()],
+            'packages': [determine_dkms_package()],
             'server_packages': ['neutron-server',
                                 'python-neutron-plugin-midonet'],
             'server_services': ['neutron-server']
@@ -233,6 +233,18 @@
                                              'neutron-plugin-ml2']
         # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
         plugins['nvp'] = plugins['nsx']
+    if release >= 'kilo':
+        plugins['midonet']['driver'] = (
+            'neutron.plugins.midonet.plugin.MidonetPluginV2')
+    if release >= 'liberty':
+        midonet_origin = config('midonet-origin')
+        if midonet_origin is not None and midonet_origin[4:5] == '1':
+            plugins['midonet']['driver'] = (
+                'midonet.neutron.plugin_v1.MidonetPluginV2')
+            plugins['midonet']['server_packages'].remove(
+                'python-neutron-plugin-midonet')
+            plugins['midonet']['server_packages'].append(
+                'python-networking-midonet')
     return plugins
 
 
 
=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-01-13 18:36:55 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-02-11 16:47:55 +0000
@@ -25,6 +25,7 @@
 import re
 
 import six
+import tempfile
 import traceback
 import uuid
 import yaml
@@ -41,6 +42,7 @@
     config,
     log as juju_log,
     charm_dir,
+    DEBUG,
     INFO,
     related_units,
     relation_ids,
@@ -105,16 +107,26 @@
 
 # The ugly duckling - must list releases oldest to newest
 SWIFT_CODENAMES = OrderedDict([
-    ('diablo',   ['1.4.3']),
-    ('essex',    ['1.4.8']),
-    ('folsom',   ['1.7.4']),
-    ('grizzly',  ['1.7.6', '1.7.7', '1.8.0']),
-    ('havana',   ['1.9.0', '1.9.1', '1.10.0']),
-    ('icehouse', ['1.11.0', '1.12.0', '1.13.0', '1.13.1']),
-    ('juno',     ['2.0.0', '2.1.0', '2.2.0']),
-    ('kilo',     ['2.2.1', '2.2.2']),
-    ('liberty',  ['2.3.0', '2.4.0', '2.5.0']),
-    ('mitaka',   ['2.5.0']),
+    ('diablo',
+        ['1.4.3']),
+    ('essex',
+        ['1.4.8']),
+    ('folsom',
+        ['1.7.4']),
+    ('grizzly',
+        ['1.7.6', '1.7.7', '1.8.0']),
+    ('havana',
+        ['1.9.0', '1.9.1', '1.10.0']),
+    ('icehouse',
+        ['1.11.0', '1.12.0', '1.13.0', '1.13.1']),
+    ('juno',
+        ['2.0.0', '2.1.0', '2.2.0']),
+    ('kilo',
+        ['2.2.1', '2.2.2']),
+    ('liberty',
+        ['2.3.0', '2.4.0', '2.5.0']),
+    ('mitaka',
+        ['2.5.0']),
 ])
 
 # >= Liberty version->codename mapping
@@ -337,12 +349,42 @@
 
 
 def import_key(keyid):
-    cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 " \
-          "--recv-keys %s" % keyid
-    try:
-        subprocess.check_call(cmd.split(' '))
-    except subprocess.CalledProcessError:
-        error_out("Error importing repo key %s" % keyid)
+    key = keyid.strip()
+    if (key.startswith('-----BEGIN PGP PUBLIC KEY BLOCK-----') and
+            key.endswith('-----END PGP PUBLIC KEY BLOCK-----')):
+        juju_log("PGP key found (looks like ASCII Armor format)", level=DEBUG)
+        juju_log("Importing ASCII Armor PGP key", level=DEBUG)
+        with tempfile.NamedTemporaryFile() as keyfile:
+            with open(keyfile.name, 'w') as fd:
+                fd.write(key)
+                fd.write("\n")
+
+            cmd = ['apt-key', 'add', keyfile.name]
+            try:
+                subprocess.check_call(cmd)
+            except subprocess.CalledProcessError:
+                error_out("Error importing PGP key '%s'" % key)
+    else:
+        juju_log("PGP key found (looks like Radix64 format)", level=DEBUG)
+        juju_log("Importing PGP key from keyserver", level=DEBUG)
+        cmd = ['apt-key', 'adv', '--keyserver',
+               'hkp://keyserver.ubuntu.com:80', '--recv-keys', key]
+        try:
+            subprocess.check_call(cmd)
+        except subprocess.CalledProcessError:
+            error_out("Error importing PGP key '%s'" % key)
+
+
+def get_source_and_pgp_key(input):
+    """Look for a pgp key ID or ascii-armor key in the given input."""
+    index = input.strip()
+    index = input.rfind('|')
+    if index < 0:
+        return input, None
+
+    key = input[index + 1:].strip('|')
+    source = input[:index]
+    return source, key
 
 
 def configure_installation_source(rel):
@@ -354,16 +396,16 @@
         with open('/etc/apt/sources.list.d/juju_deb.list', 'w') as f:
             f.write(DISTRO_PROPOSED % ubuntu_rel)
     elif rel[:4] == "ppa:":
-        src = rel
+        src, key = get_source_and_pgp_key(rel)
+        if key:
+            import_key(key)
+
         subprocess.check_call(["add-apt-repository", "-y", src])
     elif rel[:3] == "deb":
-        l = len(rel.split('|'))
-        if l == 2:
-            src, key = rel.split('|')
-            juju_log("Importing PPA key from keyserver for %s" % src)
+        src, key = get_source_and_pgp_key(rel)
+        if key:
             import_key(key)
-        elif l == 1:
-            src = rel
+
         with open('/etc/apt/sources.list.d/juju_deb.list', 'w') as f:
             f.write(src)
     elif rel[:6] == 'cloud:':
 
=== modified file 'charmhelpers/contrib/python/packages.py'
--- charmhelpers/contrib/python/packages.py	2016-01-04 21:31:57 +0000
+++ charmhelpers/contrib/python/packages.py	2016-02-11 16:47:55 +0000
@@ -19,20 +19,35 @@
 
 import os
 import subprocess
+import sys
 
 from charmhelpers.fetch import apt_install, apt_update
 from charmhelpers.core.hookenv import charm_dir, log
 
-try:
-    from pip import main as pip_execute
-except ImportError:
-    apt_update()
-    apt_install('python-pip')
-    from pip import main as pip_execute
-
 __author__ = "Jorge Niedbalski <[e-mail]>"
 
 
+def pip_execute(*args, **kwargs):
+    """Overriden pip_execute() to stop sys.path being changed.
+
+    The act of importing main from the pip module seems to cause add wheels
+    from the /usr/share/python-wheels which are installed by various tools.
+    This function ensures that sys.path remains the same after the call is
+    executed.
+    """
+    try:
+        _path = sys.path
+        try:
+            from pip import main as _pip_execute
+        except ImportError:
+            apt_update()
+            apt_install('python-pip')
+            from pip import main as _pip_execute
+        _pip_execute(*args, **kwargs)
+    finally:
+        sys.path = _path
+
+
 def parse_options(given, available):
     """Given a set of options, check if available"""
     for key, value in sorted(given.items()):
 
=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-01-07 09:19:41 +0000
+++ charmhelpers/core/host.py	2016-02-11 16:47:55 +0000
@@ -138,7 +138,8 @@
         except subprocess.CalledProcessError:
             return False
         else:
-            if ("start/running" in output or "is running" in output):
+            if ("start/running" in output or "is running" in output or
+                    "up and running" in output):
                 return True
             else:
                 return False
@@ -160,13 +161,13 @@
 
 
 def init_is_systemd():
+    """Return True if the host system uses systemd, False otherwise."""
     return os.path.isdir(SYSTEMD_SYSTEM)
 
 
 def adduser(username, password=None, shell='/bin/bash', system_user=False,
             primary_group=None, secondary_groups=None):
-    """
-    Add a user to the system.
+    """Add a user to the system.
 
     Will log but otherwise succeed if the user already exists.
 
@@ -174,7 +175,7 @@
     :param str password: Password for user; if ``None``, create a system user
     :param str shell: The default shell for the user
     :param bool system_user: Whether to create a login or system user
-    :param str primary_group: Primary group for user; defaults to their username
+    :param str primary_group: Primary group for user; defaults to username
     :param list secondary_groups: Optional list of additional groups
 
     :returns: The password database entry struct, as returned by `pwd.getpwnam`
@@ -300,14 +301,12 @@
 
 
 def fstab_remove(mp):
-    """Remove the given mountpoint entry from /etc/fstab
-    """
+    """Remove the given mountpoint entry from /etc/fstab"""
     return Fstab.remove_by_mountpoint(mp)
 
 
 def fstab_add(dev, mp, fs, options=None):
-    """Adds the given device entry to the /etc/fstab file
-    """
+    """Adds the given device entry to the /etc/fstab file"""
     return Fstab.add(dev, mp, fs, options=options)
 
 
@@ -363,8 +362,7 @@
 
 
 def file_hash(path, hash_type='md5'):
-    """
-    Generate a hash checksum of the contents of 'path' or None if not found.
+    """Generate a hash checksum of the contents of 'path' or None if not found.
 
     :param str hash_type: Any hash alrgorithm supported by :mod:`hashlib`,
                           such as md5, sha1, sha256, sha512, etc.
@@ -379,10 +377,9 @@
 
 
 def path_hash(path):
-    """
-    Generate a hash checksum of all files matching 'path'. Standard wildcards
-    like '*' and '?' are supported, see documentation for the 'glob' module for
-    more information.
+    """Generate a hash checksum of all files matching 'path'. Standard
+    wildcards like '*' and '?' are supported, see documentation for the 'glob'
+    module for more information.
 
     :return: dict: A { filename: hash } dictionary for all matched files.
                    Empty if none found.
@@ -394,8 +391,7 @@
 
 
 def check_hash(path, checksum, hash_type='md5'):
-    """
-    Validate a file using a cryptographic checksum.
+    """Validate a file using a cryptographic checksum.
 
     :param str checksum: Value of the checksum used to validate the file.
     :param str hash_type: Hash algorithm used to generate `checksum`.
@@ -410,6 +406,7 @@
 
 
 class ChecksumError(ValueError):
+    """A class derived from Value error to indicate the checksum failed."""
     pass
 
 
@@ -515,7 +512,7 @@
 
 
 def list_nics(nic_type=None):
-    '''Return a list of nics of given type(s)'''
+    """Return a list of nics of given type(s)"""
     if isinstance(nic_type, six.string_types):
         int_types = [nic_type]
     else:
@@ -557,12 +554,13 @@
 
 
 def set_nic_mtu(nic, mtu):
-    '''Set MTU on a network interface'''
+    """Set the Maximum Transmission Unit (MTU) on a network interface."""
     cmd = ['ip', 'link', 'set', nic, 'mtu', mtu]
     subprocess.check_call(cmd)
 
 
 def get_nic_mtu(nic):
+    """Return the Maximum Transmission Unit (MTU) for a network interface."""
     cmd = ['ip', 'addr', 'show', nic]
     ip_output = subprocess.check_output(cmd).decode('UTF-8').split('\n')
     mtu = ""
@@ -574,6 +572,7 @@
 
 
 def get_nic_hwaddr(nic):
+    """Return the Media Access Control (MAC) for a network interface."""
     cmd = ['ip', '-o', '-0', 'addr', 'show', nic]
     ip_output = subprocess.check_output(cmd).decode('UTF-8')
     hwaddr = ""
@@ -584,7 +583,7 @@
 
 
 def cmp_pkgrevno(package, revno, pkgcache=None):
-    '''Compare supplied revno with the revno of the installed package
+    """Compare supplied revno with the revno of the installed package
 
     *  1 => Installed revno is greater than supplied arg
     *  0 => Installed revno is the same as supplied arg
@@ -593,7 +592,7 @@
     This function imports apt_cache function from charmhelpers.fetch if
     the pkgcache argument is None. Be sure to add charmhelpers.fetch if
     you call this function, or pass an apt_pkg.Cache() instance.
-    '''
+    """
     import apt_pkg
     if not pkgcache:
         from charmhelpers.fetch import apt_cache
@@ -603,19 +602,27 @@
 
 
 @contextmanager
-def chdir(d):
+def chdir(directory):
+    """Change the current working directory to a different directory for a code
+    block and return the previous directory after the block exits. Useful to
+    run commands from a specificed directory.
+
+    :param str directory: The directory path to change to for this context.
+    """
     cur = os.getcwd()
     try:
-        yield os.chdir(d)
+        yield os.chdir(directory)
     finally:
         os.chdir(cur)
 
 
 def chownr(path, owner, group, follow_links=True, chowntopdir=False):
-    """
-    Recursively change user and group ownership of files and directories
+    """Recursively change user and group ownership of files and directories
     in given path. Doesn't chown path itself by default, only its children.
 
+    :param str path: The string path to start changing ownership.
+    :param str owner: The owner string to use when looking up the uid.
+    :param str group: The group string to use when looking up the gid.
     :param bool follow_links: Also Chown links if True
     :param bool chowntopdir: Also chown path itself if True
     """
@@ -639,15 +646,23 @@
 
 
 def lchownr(path, owner, group):
+    """Recursively change user and group ownership of files and directories
+    in a given path, not following symbolic links. See the documentation for
+    'os.lchown' for more information.
+
+    :param str path: The string path to start changing ownership.
+    :param str owner: The owner string to use when looking up the uid.
+    :param str group: The group string to use when looking up the gid.
+    """
     chownr(path, owner, group, follow_links=False)
 
 
 def get_total_ram():
-    '''The total amount of system RAM in bytes.
+    """The total amount of system RAM in bytes.
 
     This is what is reported by the OS, and may be overcommitted when
     there are multiple containers hosted on the same machine.
-    '''
+    """
     with open('/proc/meminfo', 'r') as f:
         for line in f.readlines():
             if line:
 
=== modified file 'charmhelpers/fetch/giturl.py'
--- charmhelpers/fetch/giturl.py	2016-01-13 18:36:55 +0000
+++ charmhelpers/fetch/giturl.py	2016-02-11 16:47:55 +0000
@@ -15,7 +15,7 @@
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from subprocess import check_call
+from subprocess import check_call, CalledProcessError
 from charmhelpers.fetch import (
     BaseFetchHandler,
     UnhandledSource,
@@ -63,6 +63,8 @@
                                     branch_name)
         try:
             self.clone(source, dest_dir, branch, depth)
+        except CalledProcessError as e:
+            raise UnhandledSource(e)
         except OSError as e:
             raise UnhandledSource(e.strerror)
         return dest_dir
 
=== modified file 'lib/swift_storage_context.py'
--- lib/swift_storage_context.py	2015-11-24 13:51:05 +0000
+++ lib/swift_storage_context.py	2016-02-11 16:47:55 +0000
@@ -80,14 +80,11 @@
     interfaces = []
 
     def __call__(self):
-        import psutil
-        multiplier = int(config('worker-multiplier')) or 1
         ctxt = {
             'local_ip': unit_private_ip(),
             'account_server_port': config('account-server-port'),
             'container_server_port': config('container-server-port'),
             'object_server_port': config('object-server-port'),
-            'workers': str(psutil.NUM_CPUS * multiplier),
             'object_server_threads_per_disk': config(
                 'object-server-threads-per-disk'),
             'account_max_connections': config('account-max-connections'),
 
=== modified file 'lib/swift_storage_utils.py'
--- lib/swift_storage_utils.py	2015-11-02 21:40:22 +0000
+++ lib/swift_storage_utils.py	2016-02-11 16:47:55 +0000
@@ -132,7 +132,8 @@
     for server in ['account', 'object', 'container']:
         configs.register('/etc/swift/%s-server.conf' % server,
                          [SwiftStorageServerContext(),
-                          context.BindHostContext()]),
+                          context.BindHostContext(),
+                          context.WorkerConfigContext()]),
     return configs
 
 
 
=== modified file 'tests/021-basic-xenial-mitaka' (properties changed: -x to +x)
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2016-01-04 21:31:57 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2016-02-11 16:47:55 +0000
@@ -121,11 +121,12 @@
 
         # Charms which should use the source config option
         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
-                      'ceph-osd', 'ceph-radosgw']
+                      'ceph-osd', 'ceph-radosgw', 'ceph-mon']
 
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
-                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
+                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
+                     'cinder-backup']
 
         if self.openstack:
             for svc in services:
 
=== modified file 'unit_tests/test_swift_storage_context.py'
--- unit_tests/test_swift_storage_context.py	2015-07-17 15:52:38 +0000
+++ unit_tests/test_swift_storage_context.py	2016-02-11 16:47:55 +0000
@@ -67,18 +67,15 @@
             _file.write.assert_called_with('RSYNC_ENABLE=true\n')
 
     def test_swift_storage_server_context(self):
-        import psutil
         self.unit_private_ip.return_value = '10.0.0.5'
         self.test_config.set('account-server-port', '500')
         self.test_config.set('object-server-port', '501')
         self.test_config.set('container-server-port', '502')
         self.test_config.set('object-server-threads-per-disk', '3')
-        self.test_config.set('worker-multiplier', '3')
         self.test_config.set('object-replicator-concurrency', '3')
         self.test_config.set('account-max-connections', '10')
         self.test_config.set('container-max-connections', '10')
         self.test_config.set('object-max-connections', '10')
-        num_workers = psutil.NUM_CPUS * 3
         ctxt = swift_context.SwiftStorageServerContext()
         result = ctxt()
         ex = {
@@ -87,7 +84,6 @@
             'account_server_port': '500',
             'local_ip': '10.0.0.5',
             'object_server_threads_per_disk': '3',
-            'workers': str(num_workers),
             'object_replicator_concurrency': '3',
             'account_max_connections': '10',
             'container_max_connections': '10',
 
=== modified file 'unit_tests/test_swift_storage_utils.py'
--- unit_tests/test_swift_storage_utils.py	2015-11-16 20:56:57 +0000
+++ unit_tests/test_swift_storage_utils.py	2016-02-11 16:47:55 +0000
@@ -292,6 +292,7 @@
         renderer.assert_called_with(templates_dir=swift_utils.TEMPLATES,
                                     openstack_release='essex')
 
+    @patch('charmhelpers.contrib.openstack.context.WorkerConfigContext')
     @patch('charmhelpers.contrib.openstack.context.BindHostContext')
     @patch.object(swift_utils, 'SwiftStorageContext')
     @patch.object(swift_utils, 'RsyncContext')
@@ -299,11 +300,12 @@
     @patch('charmhelpers.contrib.openstack.templating.OSConfigRenderer')
     def test_register_configs_post_install(self, renderer,
                                            swift, rsync, server,
-                                           bind_context):
+                                           bind_context, worker_context):
         swift.return_value = 'swift_context'
         rsync.return_value = 'rsync_context'
         server.return_value = 'swift_server_context'
         bind_context.return_value = 'bind_host_context'
+        worker_context.return_value = 'worker_context'
         self.get_os_codename_package.return_value = 'grizzly'
         configs = MagicMock()
         configs.register = MagicMock()
@@ -316,11 +318,14 @@
             call('/etc/rsync-juju.d/050-swift-storage.conf',
                  ['rsync_context', 'swift_context']),
             call('/etc/swift/account-server.conf', ['swift_context',
-                                                    'bind_host_context']),
+                                                    'bind_host_context',
+                                                    'worker_context']),
             call('/etc/swift/object-server.conf', ['swift_context',
-                                                   'bind_host_context']),
+                                                   'bind_host_context',
+                                                   'worker_context']),
             call('/etc/swift/container-server.conf', ['swift_context',
-                                                      'bind_host_context'])
+                                                      'bind_host_context',
+                                                      'worker_context'])
         ]
         self.assertEquals(ex, configs.register.call_args_list)