Merge lp:~corey.bryant/charms/trusty/keystone/systemd into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Corey Bryant]

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

charm_unit_test #1165 keystone-next for corey.bryant mp287112
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/15191779/
Build: http://10.245.162.36:8080/job/charm_unit_test/1165/

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

charm_lint_check #1408 keystone-next for corey.bryant mp287112
    LINT OK: passed

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

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

charm_amulet_test #518 keystone-next for corey.bryant mp287112
    AMULET OK: passed

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

Unmerged revisions

212. By Corey Bryant on 2016-02-24

Add systemd init support for deploy from source

211. By Corey Bryant on 2016-02-24

Sync charm-helpers

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-02-19 14:49:59 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-02-24 22:53:43 +0000
@@ -237,14 +237,12 @@
         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')
+        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-02-19 14:49:59 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-02-24 22:53:43 +0000
@@ -24,6 +24,7 @@
 import sys
 import re
 import itertools
+import shutil
 
 import six
 import tempfile
@@ -846,6 +847,43 @@
     return None
 
 
+def git_generate_systemd_init_files(templates_dir):
+    """
+    Generate systemd init files.
+
+    Generates and installs systemd init units and script files based on the
+    *.init.in files contained in the templates_dir directory.
+    """
+    for f in os.listdir(templates_dir):
+        if f.endswith(".init.in"):
+            init_in_f = f
+            init_f = f[:-8]
+            service_f = init_f + '.service'
+
+            init_in = os.path.join(templates_dir, init_in_f)
+            init = os.path.join(templates_dir, init_f)
+            service = os.path.join(templates_dir, service_f)
+
+            init_dest = os.path.join('/etc/init.d', init_f)
+            service_dest = os.path.join('/lib/systemd/system', service_f)
+
+            shutil.copyfile(init_in, init)
+            with open(init, 'a') as outfile:
+                with open('/usr/share/openstack-pkg-tools/init-script-template') as infile:
+                    outfile.write(infile.read())
+
+            cmd = ['pkgos-gen-systemd-unit', init_in]
+            subprocess.check_call(cmd)
+
+            if os.path.exists(init_dest):
+                os.remove(init_dest)
+            if os.path.exists(service_dest):
+                os.remove(service_dest)
+            shutil.move(init, init_dest)
+            shutil.move(service, service_dest)
+            os.chmod(init_dest, 0o755)
+
+
 def os_workload_status(configs, required_interfaces, charm_func=None):
     """
     Decorator to set workload status based on complete contexts

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2016-01-04 21:27:51 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2016-02-24 22:53:43 +0000
@@ -120,6 +120,7 @@
     """
     A custom error to inform the caller that a pool creation failed.  Provides an error message
     """
+
     def __init__(self, message):
         super(PoolCreationError, self).__init__(message)
 
@@ -129,6 +130,7 @@
     An object oriented approach to Ceph pool creation. This base class is inherited by ReplicatedPool and ErasurePool.
     Do not call create() on this base class as it will not do anything.  Instantiate a child class and call create().
     """
+
     def __init__(self, service, name):
         self.service = service
         self.name = name
@@ -180,36 +182,41 @@
         :return: int.  The number of pgs to use.
         """
         validator(value=pool_size, valid_type=int)
-        osds = get_osds(self.service)
-        if not osds:
+        osd_list = get_osds(self.service)
+        if not osd_list:
             # NOTE(james-page): Default to 200 for older ceph versions
             # which don't support OSD query from cli
             return 200
 
+        osd_list_length = len(osd_list)
         # Calculate based on Ceph best practices
-        if osds < 5:
+        if osd_list_length < 5:
             return 128
-        elif 5 < osds < 10:
+        elif 5 < osd_list_length < 10:
             return 512
-        elif 10 < osds < 50:
+        elif 10 < osd_list_length < 50:
             return 4096
         else:
-            estimate = (osds * 100) / pool_size
+            estimate = (osd_list_length * 100) / pool_size
             # Return the next nearest power of 2
             index = bisect.bisect_right(powers_of_two, estimate)
             return powers_of_two[index]
 
 
 class ReplicatedPool(Pool):
-    def __init__(self, service, name, replicas=2):
+    def __init__(self, service, name, pg_num=None, replicas=2):
         super(ReplicatedPool, self).__init__(service=service, name=name)
         self.replicas = replicas
+        if pg_num is None:
+            self.pg_num = self.get_pgs(self.replicas)
+        else:
+            self.pg_num = pg_num
 
     def create(self):
         if not pool_exists(self.service, self.name):
             # Create it
-            pgs = self.get_pgs(self.replicas)
-            cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create', self.name, str(pgs)]
+            cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create',
+                   self.name, str(self.pg_num)]
             try:
                 check_call(cmd)
             except CalledProcessError:
@@ -241,7 +248,7 @@
 
             pgs = self.get_pgs(int(erasure_profile['k']) + int(erasure_profile['m']))
             # Create it
-            cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create', self.name, str(pgs),
+            cmd = ['ceph', '--id', self.service, 'osd', 'pool', 'create', self.name, str(pgs), str(pgs),
                    'erasure', self.erasure_code_profile]
             try:
                 check_call(cmd)
@@ -322,7 +329,8 @@
     :return: None.  Can raise CalledProcessError
     """
     # Set a byte quota on a RADOS pool in ceph.
-    cmd = ['ceph', '--id', service, 'osd', 'pool', 'set-quota', pool_name, 'max_bytes', max_bytes]
+    cmd = ['ceph', '--id', service, 'osd', 'pool', 'set-quota', pool_name,
+           'max_bytes', str(max_bytes)]
     try:
         check_call(cmd)
     except CalledProcessError:
@@ -343,7 +351,25 @@
         raise
 
 
-def create_erasure_profile(service, profile_name, erasure_plugin_name='jerasure', failure_domain='host',
+def remove_erasure_profile(service, profile_name):
+    """
+    Create a new erasure code profile if one does not already exist for it.  Updates
+    the profile if it exists. Please see http://docs.ceph.com/docs/master/rados/operations/erasure-code-profile/
+    for more details
+    :param service: six.string_types. The Ceph user name to run the command under
+    :param profile_name: six.string_types
+    :return: None.  Can raise CalledProcessError
+    """
+    cmd = ['ceph', '--id', service, 'osd', 'erasure-code-profile', 'rm',
+           profile_name]
+    try:
+        check_call(cmd)
+    except CalledProcessError:
+        raise
+
+
+def create_erasure_profile(service, profile_name, erasure_plugin_name='jerasure',
+                           failure_domain='host',
                            data_chunks=2, coding_chunks=1,
                            locality=None, durability_estimator=None):
     """

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2016-02-19 14:49:59 +0000
+++ hooks/keystone_utils.py	2016-02-24 22:53:43 +0000
@@ -44,6 +44,7 @@
     configure_installation_source,
     error_out,
     get_os_codename_install_source,
+    git_generate_systemd_init_files,
     git_install_requested,
     git_clone_and_install,
     git_src_dir,
@@ -97,12 +98,12 @@
     adduser,
     add_group,
     add_user_to_group,
+    lsb_release,
     mkdir,
     service_stop,
     service_start,
     service_restart,
     pwgen,
-    lsb_release,
     write_file,
 )
 
@@ -146,6 +147,7 @@
     'libxml2-dev',
     'libxslt1-dev',
     'libyaml-dev',
+    'openstack-pkg-tools',
     'python-dev',
     'python-pip',
     'python-setuptools',
@@ -1811,22 +1813,32 @@
     render('git/logging.conf', '/etc/keystone/logging.conf', {}, perms=0o644)
 
     bin_dir = os.path.join(git_pip_venv_dir(projects_yaml), 'bin')
-    keystone_context = {
-        'service_description': 'Keystone API server',
-        'service_name': 'Keystone',
-        'user_name': 'keystone',
-        'start_dir': '/var/lib/keystone',
-        'process_name': 'keystone',
-        'executable_name': os.path.join(bin_dir, 'keystone-all'),
-        'config_files': ['/etc/keystone/keystone.conf'],
-        'log_file': '/var/log/keystone/keystone.log',
-    }
 
-    # NOTE(coreycb): Needs systemd support
-    templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
-    templates_dir = os.path.join(charm_dir(), templates_dir)
-    render('git.upstart', '/etc/init/keystone.conf', keystone_context,
-           perms=0o644, templates_dir=templates_dir)
+    # Use systemd init units/scripts from ubuntu wily onward
+    if lsb_release()['DISTRIB_RELEASE'] >= '15.10':
+        keystone_context = {
+            'daemon_path': os.path.join(bin_dir, 'keystone-all'),
+        }
+        templates_dir = os.path.join(charm_dir(), 'templates/git')
+        render('git/keystone.init.in.template',
+               os.path.join(templates_dir, 'keystone.init.in'),
+               keystone_context, perms=0o644)
+        git_generate_systemd_init_files(templates_dir)
+    else:
+        keystone_context = {
+            'service_description': 'Keystone API server',
+            'service_name': 'Keystone',
+            'user_name': 'keystone',
+            'start_dir': '/var/lib/keystone',
+            'process_name': 'keystone',
+            'executable_name': os.path.join(bin_dir, 'keystone-all'),
+            'config_files': ['/etc/keystone/keystone.conf'],
+            'log_file': '/var/log/keystone/keystone.log',
+        }
+        templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
+        templates_dir = os.path.join(charm_dir(), templates_dir)
+        render('git.upstart', '/etc/init/keystone.conf', keystone_context,
+               perms=0o644, templates_dir=templates_dir)
 
     service_restart('keystone')
 

=== added file 'templates/git/keystone.init.in.template'
--- templates/git/keystone.init.in.template	1970-01-01 00:00:00 +0000
+++ templates/git/keystone.init.in.template	2016-02-24 22:53:43 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          keystone
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      mysql postgresql slapd rabbitmq-server ntp
+# Should-Stop:       mysql postgresql slapd rabbitmq-server ntp
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: OpenStack cloud identity service
+# Description:       This is the identity service used by OpenStack for
+#                    authentication (authN) and high-level authorization (authZ).
+### END INIT INFO
+
+DESC="OpenStack Identity service"
+PROJECT_NAME=keystone
+NAME=keystone
+DAEMON={{ daemon_path }}
+