Attachment 614155 Details for Bug 858311 – patch from Federico Simoncelli

[patch] patch from Federico Simoncelli

0001-update-the-nova-polkit-rules.patch (text/plain), 2.62 KB, created by Alan Pevec on 2012-09-18 23:21:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Pevec

Created: 2012-09-18 23:21:08 UTC

Size: 2.62 KB

patch

obsolete

>From 396bdeb77edd82c0f303109f0ac3e6dc6a94a3de Mon Sep 17 00:00:00 2001
>From: Federico Simoncelli <fsimonce@redhat.com>
>Date: Tue, 18 Sep 2012 22:47:44 -0400
>Subject: [PATCH] update the nova-polkit rules
>
>---
> nova-polkit.pkla    |    6 ------
> nova-polkit.rules   |    8 ++++++++
> openstack-nova.spec |    7 +++----
> 3 files changed, 11 insertions(+), 10 deletions(-)
> delete mode 100644 nova-polkit.pkla
> create mode 100644 nova-polkit.rules
>
>diff --git a/nova-polkit.pkla b/nova-polkit.pkla
>deleted file mode 100644
>index ae1467d..0000000
>--- a/nova-polkit.pkla
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-[Allow nova libvirt management permissions]
>-Identity=unix-user:nova
>-Action=org.libvirt.unix.manage
>-ResultAny=yes
>-ResultInactive=yes
>-ResultActive=yes
>diff --git a/nova-polkit.rules b/nova-polkit.rules
>new file mode 100644
>index 0000000..5a9df09
>--- /dev/null
>+++ b/nova-polkit.rules
>@@ -0,0 +1,8 @@
>+# openstack-nova libvirt management permissions
>+
>+polkit.addRule(function(action, subject) {
>+    if (action.id == "org.libvirt.unix.manage" &&
>+        subject.user == "nova") {
>+        return polkit.Result.YES;
>+    }
>+});
>diff --git a/openstack-nova.spec b/openstack-nova.spec
>index b901788..a7fdde3 100644
>--- a/openstack-nova.spec
>+++ b/openstack-nova.spec
>@@ -24,7 +24,7 @@ Source19:         openstack-nova-console.service
> Source20:         openstack-nova-consoleauth.service
> Source25:         openstack-nova-metadata-api.service
> 
>-Source21:         nova-polkit.pkla
>+Source21:         nova-polkit.rules
> Source22:         nova-ifc-template
> Source24:         nova-sudoers
> 
>@@ -430,8 +430,7 @@ install -p -D -m 644 %{SOURCE22} %{buildroot}%{_datarootdir}/nova/interfaces.tem
> mkdir -p %{buildroot}%{_datarootdir}/nova/rootwrap/
> install -p -D -m 644 etc/nova/rootwrap.d/* %{buildroot}%{_datarootdir}/nova/rootwrap/
> 
>-install -d -m 755 %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d
>-install -p -D -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d/50-nova.pkla
>+install -p -D -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/polkit-1/rules.d/50-nova.rules
> 
> # Remove unneeded in production stuff
> rm -f %{buildroot}%{_bindir}/nova-debug
>@@ -636,7 +635,7 @@ fi
> %config(noreplace) %attr(-, root, nova) %{_sysconfdir}/nova/policy.json
> %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-nova
> %config(noreplace) %{_sysconfdir}/sudoers.d/nova
>-%config(noreplace) %{_sysconfdir}/polkit-1/localauthority/50-local.d/50-nova.pkla
>+%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/50-nova.rules
> 
> %dir %attr(0755, nova, root) %{_localstatedir}/log/nova
> %dir %attr(0755, nova, root) %{_localstatedir}/run/nova
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 858311: 614155