diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py
index f4af1769..3cfc983e 100644
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
@@ -131,40 +131,40 @@ SWIFT_CODENAMES = OrderedDict([
# >= Liberty version->codename mapping
PACKAGE_CODENAMES = {
'nova-common': OrderedDict([
- ('12.0.0', 'liberty'),
- ('13.0.0', 'mitaka'),
+ ('12.0', 'liberty'),
+ ('13.0', 'mitaka'),
]),
'neutron-common': OrderedDict([
- ('7.0.0', 'liberty'),
- ('8.0.0', 'mitaka'),
+ ('7.0', 'liberty'),
+ ('8.0', 'mitaka'),
]),
'cinder-common': OrderedDict([
- ('7.0.0', 'liberty'),
- ('8.0.0', 'mitaka'),
+ ('7.0', 'liberty'),
+ ('8.0', 'mitaka'),
]),
'keystone': OrderedDict([
- ('8.0.0', 'liberty'),
- ('9.0.0', 'mitaka'),
+ ('8.0', 'liberty'),
+ ('9.0', 'mitaka'),
]),
'horizon-common': OrderedDict([
- ('8.0.0', 'liberty'),
- ('9.0.0', 'mitaka'),
+ ('8.0', 'liberty'),
+ ('9.0', 'mitaka'),
]),
'ceilometer-common': OrderedDict([
- ('5.0.0', 'liberty'),
- ('6.0.0', 'mitaka'),
+ ('5.0', 'liberty'),
+ ('6.0', 'mitaka'),
]),
'heat-common': OrderedDict([
- ('5.0.0', 'liberty'),
- ('6.0.0', 'mitaka'),
+ ('5.0', 'liberty'),
+ ('6.0', 'mitaka'),
]),
'glance-common': OrderedDict([
- ('11.0.0', 'liberty'),
- ('12.0.0', 'mitaka'),
+ ('11.0', 'liberty'),
+ ('12.0', 'mitaka'),
]),
'openstack-dashboard': OrderedDict([
- ('8.0.0', 'liberty'),
- ('9.0.0', 'mitaka'),
+ ('8.0', 'liberty'),
+ ('9.0', 'mitaka'),
]),
}
@@ -251,7 +251,14 @@ def get_os_codename_package(package, fatal=True):
error_out(e)
vers = apt.upstream_version(pkg.current_ver.ver_str)
- match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+ if 'swift' in pkg.name:
+ # Fully x.y.z match for swift versions
+ match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+ else:
+ # x.y match only for 20XX.X
+ # and ignore patch level for other packages
+ match = re.match('^(\d+)\.(\d+)', vers)
+
if match:
vers = match.group(0)
@@ -263,13 +270,8 @@ def get_os_codename_package(package, fatal=True):
# < Liberty co-ordinated project versions
try:
if 'swift' in pkg.name:
- swift_vers = vers[:5]
- if swift_vers not in SWIFT_CODENAMES:
- # Deal with 1.10.0 upward
- swift_vers = vers[:6]
- return SWIFT_CODENAMES[swift_vers]
+ return SWIFT_CODENAMES[vers]
else:
- vers = vers[:6]
return OPENSTACK_CODENAMES[vers]
except KeyError:
if not fatal:
diff --git a/hooks/charmhelpers/core/kernel.py b/hooks/charmhelpers/core/kernel.py
new file mode 100644
index 00000000..5dc64952
--- /dev/null
+++ b/hooks/charmhelpers/core/kernel.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright 2014-2015 Canonical Limited.
+#
+# This file is part of charm-helpers.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers. If not, see .
+
+__author__ = "Jorge Niedbalski "
+
+from charmhelpers.core.hookenv import (
+ log,
+ INFO
+)
+
+from subprocess import check_call, check_output
+import re
+
+
+def modprobe(module, persist=True):
+ """Load a kernel module and configure for auto-load on reboot."""
+ cmd = ['modprobe', module]
+
+ log('Loading kernel module %s' % module, level=INFO)
+
+ check_call(cmd)
+ if persist:
+ with open('/etc/modules', 'r+') as modules:
+ if module not in modules.read():
+ modules.write(module)
+
+
+def rmmod(module, force=False):
+ """Remove a module from the linux kernel"""
+ cmd = ['rmmod']
+ if force:
+ cmd.append('-f')
+ cmd.append(module)
+ log('Removing kernel module %s' % module, level=INFO)
+ return check_call(cmd)
+
+
+def lsmod():
+ """Shows what kernel modules are currently loaded"""
+ return check_output(['lsmod'],
+ universal_newlines=True)
+
+
+def is_module_loaded(module):
+ """Checks if a kernel module is already loaded"""
+ matches = re.findall('^%s[ ]+' % module, lsmod(), re.M)
+ return len(matches) > 0
+
+
+def update_initramfs(version='all'):
+ """Updates an initramfs image"""
+ return check_call(["update-initramfs", "-k", version, "-u"])