From a05ee347f4ab5f75612857d515a96deec3d68f82 Mon Sep 17 00:00:00 2001
From: Jan Kaluža <jkaluza@redhat.com>
Date: Apr 20 2020 05:34:39 +0000
Subject: ODCS: Set the same allowed_clients for both prod and staging.


---

diff --git a/inventory/group_vars/odcs b/inventory/group_vars/odcs
index 52e95af..e9a89d5 100644
--- a/inventory/group_vars/odcs
+++ b/inventory/group_vars/odcs
@@ -30,3 +30,14 @@ odcs_celery_router_config:
   cleanup_task: odcs.server.celery_tasks.run_cleanup
   default_queue: pungi_composes
 
+odcs_allowed_clients_users:
+  humaton: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
+  mohanboddu: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
+  jkaluza: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
+  osbs@service: {}
+odcs_allowed_clients_groups:
+  sysadmin-odcs: {},
+  pungi-devel: {}
+  packager: {"source_types": ["module"]}
+  eln-sig: {"source_types": ["tag", "module", "build", "raw_config"]}
+
diff --git a/inventory/group_vars/odcs_frontend b/inventory/group_vars/odcs_frontend
index 8b850b4..7dabe36 100644
--- a/inventory/group_vars/odcs_frontend
+++ b/inventory/group_vars/odcs_frontend
@@ -37,16 +37,6 @@ fedmsg_certs:
 
 
 odcs_target_dir_url: https://odcs.fedoraproject.org/composes
-odcs_allowed_clients_users:
-  humaton: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-  mohanboddu: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-  jkaluza: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-  osbs@service: {}
-odcs_allowed_clients_groups:
-  sysadmin-odcs: {},
-  pungi-devel: {}
-  packager: {"source_types": ["module"]}
-  eln-sig: {"source_types": ["tag", "module", "build", "raw_config"]}
 
 virt_install_command: "{{ virt_install_command_two_nic }}"
 
diff --git a/inventory/group_vars/odcs_frontend_stg b/inventory/group_vars/odcs_frontend_stg
index b86dc79..0399db1 100644
--- a/inventory/group_vars/odcs_frontend_stg
+++ b/inventory/group_vars/odcs_frontend_stg
@@ -32,14 +32,6 @@ odcs_allowed_source_types: ["tag", "module"]
 
 odcs_target_dir_url: https://odcs.stg.fedoraproject.org/composes
 
-# Give access to jscotka to be able to develop module testing integration
-# for taskotron.
-odcs_allowed_clients_users:
-  jscotka: {}
-  humaton: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-  mohanboddu: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-  jkaluza: {"source_types": ["tag", "module", "build", "raw_config"], "target_dirs": ["private"]}
-
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"