From bafdeb826c8444b180355532b04e26a4214e15c8 Mon Sep 17 00:00:00 2001
From: Artem Goncharov <artem.goncharov@gmail.com>
Date: Wed, 15 Mar 2023 17:11:28 +0100
Subject: [PATCH] small updates

---
 nodepool/nodepool.yaml        |  2 --
 playbooks/base/post-logs.yaml | 22 ----------------------
 zuul/main.yaml                |  6 +++---
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 5ca52c8..ab8bdfd 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -27,8 +27,6 @@ providers:
     pools:
       - name: zuul
         labels:
-          # - name: kubernetes-namespace
-          #   type: namespace
           - name: pod-fedora-latest
             type: pod
             image: quay.io/opentelekomcloud/zuul-fedora:33
diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml
index 6b5683b..26e970b 100644
--- a/playbooks/base/post-logs.yaml
+++ b/playbooks/base/post-logs.yaml
@@ -3,25 +3,3 @@
     - name: Include Zuul manifest role
       include_role:
         name: generate-zuul-manifest
-
-    - name: Get cloud config from vault
-      no_log: true
-      vault_cloud_config:
-        vault_addr: "{{ zuul_vault_addr }}"
-        vault_token: "{{ lookup('file', zuul_base_vault_token_path) }}"
-        cloud_secret_path: "{{ vault_cloud_secret_path }}"
-        mode: "token"
-      register: cloud_config
-
-    - name: Include upload logs role
-      no_log: true
-      include_role:
-        name: upload-logs-swift1
-      vars:
-        zuul_log_path_shard_build: true
-        zuul_log_cloud_config: '{{ cloud_config.config }}'
-        zuul_log_partition: false
-        zuul_log_delete_after: 648000
-        # Unique log prefix to avoid container name collisions when ceph is
-        # used.
-        zuul_log_container: zuul_logs
diff --git a/zuul/main.yaml b/zuul/main.yaml
index cfa9aff..1a3d9d5 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -4,15 +4,15 @@
       - resource_access.zuul.roles: "admin"
 
 - admin-rule:
-    name: scs_admin
+    name: tenant-group
     conditions:
-      - resource_access.zuul.roles: "scs_admin"
+      - groups: "{tenant.name}"
 
 - tenant:
     name: scs
     admin-rules:
       - admin
-      - scs_admin
+      - tenant-group
     exclude-unprotected-branches: true
     report-build-page: true
     max-nodes-per-job: 5