Merge lp:~matsubara/charms/trusty/nova-compute-power/selinux-permissions into lp:~james-page/charms/trusty/nova-compute-power/redux

[Diogo Matsubara]

Hi James,

this patch fixes the SELinux permissions for the nova-compute-power config files.

Thanks!

[lp:~matsubara/charms/trusty/nova-compute-power/selinux-permissions]

118. By Diogo Matsubara on 2015-01-14

Update nova.conf template to point to correct lock path for Red Hat systems where the nova user has permissions to write a lock file. See https://bugzilla.redhat.com/show_bug.cgi?id=961557 for details

[James Page (james-page)]

review: Approve

=== modified file 'hooks/fabfile.py'
--- hooks/fabfile.py	2014-11-10 16:43:55 +0000
+++ hooks/fabfile.py	2015-01-14 13:58:40 +0000
@@ -56,10 +56,15 @@
     sudo('chown {} {}'.format(user, path))
 
 
+def fix_selinux_permission(path):
+    sudo('chcon -vv --user=system_u --role=object_r --type=etc_t --range=s0 '
+         '{}'.format(path))
+
+
 def fix_ml2_plugin_config():
     sudo('sed -i "s!openvswitch/ovs_neutron_plugin.ini'
          '!ml2/ml2_conf.ini!g" /etc/init.d/neutron-openvswitch-agent')
 
 
 def fix_local_ip(f):
-    sudo('sed -i "s!LOCAL_IP!%s!g" %s' % (env.host, f))
 \ No newline at end of file
+    sudo('sed -i "s!LOCAL_IP!%s!g" %s' % (env.host, f))
 
=== modified file 'hooks/nova_compute_proxy.py'
--- hooks/nova_compute_proxy.py	2014-11-10 16:43:55 +0000
+++ hooks/nova_compute_proxy.py	2015-01-14 13:58:40 +0000
@@ -22,6 +22,7 @@
     enable_shell,
     disable_shell,
     fix_path_ownership,
+    fix_selinux_permission,
     fix_ml2_plugin_config,
     fix_local_ip
 )
@@ -129,10 +130,14 @@
     def fix_path_ownership(self, user, path):
         execute(fix_path_ownership, user, path)
 
+    def fix_selinux_permission(self, path):
+        execute(fix_selinux_permission, path)
+
     def commit(self):
         for f in CONFIG_FILES:
             if os.path.exists("%s%s" % (CHARM_SCRATCH_DIR, f)):
                 self.copy_file(f)
+                self.fix_selinux_permission(f)
         self._fixup_local_ips()
 
     def _fixup_local_ips(self):
 
=== modified file 'templates/nova.conf'
--- templates/nova.conf	2014-11-12 14:58:43 +0000
+++ templates/nova.conf	2015-01-14 13:58:40 +0000
@@ -13,7 +13,7 @@
 
 # General system paths
 state_path=/var/lib/nova
-lock_path=/var/lock/nova
+lock_path=/var/lib/nova/tmp
 
 # Logging options
 logdir = /var/log/nova