Merge lp:~thedac/charm-helpers/apparmor-profiles into lp:charm-helpers

[David Ames]

Send LSB release to apparmor context templates

Set the LSB release to be consumed by apparmor context profiles

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-06-30 22:30:21 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-07-05 22:44:01 +0000
@@ -59,6 +59,7 @@
     mkdir,
     write_file,
     pwgen,
+    lsb_release,
 )
 from charmhelpers.contrib.hahelpers.cluster import (
     determine_apache_port,
@@ -1438,7 +1439,8 @@
         :return ctxt: Dictionary of the apparmor profile or None
         """
         if config('aa-profile-mode') in ['disable', 'enforce', 'complain']:
-            ctxt = {'aa_profile_mode': config('aa-profile-mode')}
+            ctxt = {'aa_profile_mode': config('aa-profile-mode'),
+                    'ubuntu_release': lsb_release()['DISTRIB_RELEASE']}
         else:
             ctxt = None
         return ctxt
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-06-30 22:30:21 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-07-05 22:44:01 +0000
@@ -515,6 +515,7 @@
     'sysctl_create',
     'kv',
     'pwgen',
+    'lsb_release',
 ]
 
 
@@ -567,6 +568,7 @@
         self.get_host_ip.side_effect = lambda hostname: hostname
         self.kv.side_effect = TestDB
         self.pwgen.return_value = 'testpassword'
+        self.lsb_release.return_value = {'DISTRIB_RELEASE': '16.04'}
 
     def _patch(self, method):
         _m = patch('charmhelpers.contrib.openstack.context.' + method)
@@ -2921,7 +2923,8 @@
         # Test complain mode
         self.config.return_value = 'complain'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa_profile_mode': 'complain'})
+                          {'aa_profile_mode': 'complain',
+                           'ubuntu_release': '16.04'})
 
     def test_apparmor_context_call_enforce(self):
         ''' Tests for the apparmor context'''
@@ -2929,7 +2932,8 @@
         # Test enforce mode
         self.config.return_value = 'enforce'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa_profile_mode': 'enforce'})
+                          {'aa_profile_mode': 'enforce',
+                           'ubuntu_release': '16.04'})
 
     def test_apparmor_context_call_disable(self):
         ''' Tests for the apparmor context'''
@@ -2937,7 +2941,8 @@
         # Test complain mode
         self.config.return_value = 'disable'
         self.assertEquals(mock_aa_object.__call__(),
-                          {'aa_profile_mode': 'disable'})
+                          {'aa_profile_mode': 'disable',
+                           'ubuntu_release': '16.04'})
 
     def test_apparmor_setup_complain(self):
         ''' Tests for the apparmor setup'''