From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 22 Sep 2022 19:26:14 +0000 (+0000)
Subject: qa/tasks/barbican: dont copy policy files
X-Git-Tag: v16.2.13~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db1a98dff92b14ecbe4f0c04c5f60842a29c6158;p=ceph.git

qa/tasks/barbican: dont copy policy files

In newer versions the policies is inside the code
so we don't need these files for default policy
anymore.

Signed-off-by: Tobias Urdin <tobias.urdin@binero.se>
(cherry picked from commit d6f5e49f3b7af110f5a18fca918d7ba3de1b3d31)
---

diff --git a/qa/tasks/barbican.py b/qa/tasks/barbican.py
index 7e2b77a42f1e..70bd734053ae 100644
--- a/qa/tasks/barbican.py
+++ b/qa/tasks/barbican.py
@@ -8,7 +8,6 @@ import http
 import json
 import time
 import math
-import os
 
 from urllib.parse import urlparse
 
@@ -158,16 +157,6 @@ def fix_barbican_api(ctx, cclient):
                          '/prop_dir =/ s#etc/barbican#{}/etc/barbican#'.format(get_barbican_dir(ctx)),
                          'bin/barbican-api'])
 
-def copy_policy_file(ctx, cclient):
-    policy_json_path = get_barbican_dir(ctx)+'/etc/barbican/policy.json'
-    if os.path.exists(policy_json_path):
-        run_in_barbican_dir(ctx, cclient,
-                            ['cp', policy_json_path, get_barbican_dir(ctx)])
-    policy_yaml_path = get_barbican_dir(ctx)+'/etc/barbican/policy.yaml'
-    if os.path.exists(policy_yaml_path):
-        run_in_barbican_dir(ctx, cclient,
-                            ['cp', policy_yaml_path, get_barbican_dir(ctx)])
-
 def create_barbican_conf(ctx, cclient):
     barbican_host, barbican_port = ctx.barbican.endpoints[cclient]
     barbican_url = 'http://{host}:{port}'.format(host=barbican_host,
@@ -202,7 +191,6 @@ def configure_barbican(ctx, config):
     set_authtoken_params(ctx, cclient, cconfig)
     fix_barbican_api(ctx, cclient)
     fix_barbican_api_paste(ctx, cclient)
-    copy_policy_file(ctx, cclient)
     create_barbican_conf(ctx, cclient)
     try:
         yield