summaryrefslogtreecommitdiffstats
path: root/qa/tasks/barbican.py
diff options
context:
space:
mode:
authorTobias Urdin <tobias.urdin@binero.se>2022-09-22 21:26:14 +0200
committerTobias Urdin <tobias.urdin@binero.se>2022-09-26 08:27:40 +0200
commitd6f5e49f3b7af110f5a18fca918d7ba3de1b3d31 (patch)
tree214dc21e0cb2169d7a6e00cb7108ed403db6c09c /qa/tasks/barbican.py
parentqa/suites/rgw: blocklist object expiry tempest tests (diff)
downloadceph-d6f5e49f3b7af110f5a18fca918d7ba3de1b3d31.tar.xz
ceph-d6f5e49f3b7af110f5a18fca918d7ba3de1b3d31.zip
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>
Diffstat (limited to 'qa/tasks/barbican.py')
-rw-r--r--qa/tasks/barbican.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/qa/tasks/barbican.py b/qa/tasks/barbican.py
index 7e2b77a42f1..70bd734053a 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