Merge branch 't32887-bug_idempotence_molecule' into 'master'

See merge request mediaserver/envsetup!24

ansible/molecule/default/tests/test_mediaserver.py

@@ -14,12 +14,6 @@ def test_server_is_installed(host):
     assert p.is_installed
 
 
-def test_server_runtime_is_installed(host):
-    p = host.package("ubicast-mediaserver-runtime")
-
-    assert p.is_installed
-
-
 def test_server_user(host):
     u = host.user("msuser")
 
@@ -46,7 +40,7 @@ def test_server_socket(host):
 
 
 def test_fail2ban_conf(host):
-    f = host.file("/etc/fail2ban/jail.d/server.local")
+    f = host.file("/etc/fail2ban/jail.d/mediaserver.conf")
 
     assert f.exists
 

ansible/molecule/default/tests/test_mirismanager.py

@@ -46,7 +46,7 @@ def test_manager_socket(host):
 
 
 def test_fail2ban_conf(host):
-    f = host.file("/etc/fail2ban/jail.d/manager.local")
+    f = host.file("/etc/fail2ban/jail.d/skyreach.conf")
 
     assert f.exists
 

ansible/molecule/default/tests/test_msmonitor.py

@@ -52,7 +52,7 @@ def test_monitor_socket(host):
 
 
 def test_fail2ban_conf(host):
-    f = host.file("/etc/fail2ban/jail.d/monitor.local")
+    f = host.file("/etc/fail2ban/jail.d/monitor.conf")
 
     assert f.exists
 

ansible/roles/celerity/tasks/main.yml

@@ -12,8 +12,8 @@
     src: celerity-config.py.j2
     dest: /etc/celerity/config.py
     mode: 0644
-    owner: celerity
-    group: celerity
+    owner: root
+    group: root
 
 - name: ensure celerity server is running
   service:

ansible/roles/mediaworker/tasks/main.yml

@@ -12,8 +12,8 @@
     src: celerity-config.py.j2
     dest: /etc/celerity/config.py
     mode: 0644
-    owner: celerity
-    group: celerity
+    owner: root
+    group: root
 
 - name: ensure celerity worker is running
   service: