Change in osmo-ci[master]: ansible: gsm-tester: Intall dbus policy file from git repo

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17773 )

Change subject: ansible: gsm-tester: Intall dbus policy file from git repo
......................................................................

ansible: gsm-tester: Intall dbus policy file from git repo

Since osmo-gsm-tester.git I17ee94b175deb88faff71e7788c482093693f8a8, the
file is available in the repository, so let's simply install it from
there.

Change-Id: Icb4827c4126c997633e23e4d778ff9b1a1836322
---
D ansible/roles/gsm-tester/files/dbus_osmo-gsm-tester.conf
M ansible/roles/gsm-tester/tasks/main.yml
2 files changed, 9 insertions(+), 17 deletions(-)

Approvals:
  pespin: Looks good to me, approved; Verified



diff --git a/ansible/roles/gsm-tester/files/dbus_osmo-gsm-tester.conf b/ansible/roles/gsm-tester/files/dbus_osmo-gsm-tester.conf
deleted file mode 100644
index d867833..0000000
--- a/ansible/roles/gsm-tester/files/dbus_osmo-gsm-tester.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Additional rules for the osmo-gsm-tester to access org.ofono from user
-land -->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-<policy group="osmo-gsm-tester">
-<allow send_destination="org.ofono"/>
-</policy>
-</busconfig>
diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml
index 0109d1b..6258fde 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -318,14 +318,6 @@
   tags:
     - osmo-gsm-tester-main
 
-- name: allow osmo-gsm-tester to access ofono
-  copy:
-    src: dbus_osmo-gsm-tester.conf
-    dest: /etc/dbus-1/system.d/osmo-gsm-tester.conf
-  tags:
-    - ofono
-    - modem
-
 - name: ensure tcpdump can be called by osmo-gsm-tester
   file:
     path: /usr/sbin/tcpdump
@@ -399,6 +391,15 @@
   tags:
     - osmo-gsm-tester-proc
 
+- name: Install dbus policy file to allow osmo-gsm-tester group to access ofono
+  shell: |
+      cp utils/dbus-1/* /etc/dbus-1/system.d/
+  args:
+    chdir: /root/osmo-gsm-tester
+  tags:
+    - ofono
+    - modem
+
 - name: logrotate limit filesizes to 10M
   copy:
     content: "maxsize 10M"

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17773
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icb4827c4126c997633e23e4d778ff9b1a1836322
Gerrit-Change-Number: 17773
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200411/a040d05d/attachment.htm>