From 53d1d9190c9919905df9295e782fedfa692303cf Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Fri, 29 Nov 2019 14:47:06 +0100
Subject: [PATCH] OSBS: applying the orchestrator and worker labels is now done
 in the inventory

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 .../osbs/setup-orchestrator-namespace.yml     | 15 ----------
 .../groups/osbs/setup-worker-namespace.yml    | 28 -------------------
 2 files changed, 43 deletions(-)

diff --git a/playbooks/groups/osbs/setup-orchestrator-namespace.yml b/playbooks/groups/osbs/setup-orchestrator-namespace.yml
index b68704a970..3c31d8e3b0 100644
--- a/playbooks/groups/osbs/setup-orchestrator-namespace.yml
+++ b/playbooks/groups/osbs/setup-orchestrator-namespace.yml
@@ -166,18 +166,3 @@
         file
         state=absent
         path="/tmp/.dockercfg"
-
-- name: Add the orchestrator labels to the nodes
-  hosts: osbs_masters_stg[0]:osbs_masters[0]
-  tags:
-    - osbs-labels-nodes
-  tasks:
-    - name: Add the orchestrator labels to the nodes
-      command: "oc -n {{ osbs_namespace }} label nodes {{ item }} orchestrator=true --overwrite"
-      loop: "{{ groups['osbs_nodes_stg'] }}"
-      when: env == "staging"
-
-    - name: Add the orchestrator labels to the nodes
-      command: "oc -n {{ osbs_namespace }} label nodes {{ item }} orchestrator=true --overwrite"
-      loop: "{{ groups['osbs_nodes'] }}"
-      when: env == "production"
diff --git a/playbooks/groups/osbs/setup-worker-namespace.yml b/playbooks/groups/osbs/setup-worker-namespace.yml
index 149b7b15b3..1b94f9510e 100644
--- a/playbooks/groups/osbs/setup-worker-namespace.yml
+++ b/playbooks/groups/osbs/setup-worker-namespace.yml
@@ -76,31 +76,3 @@
         file
         state=absent
         path="/tmp/.dockercfg"
-
-- name: Add the worker labels to the nodes x86_64
-  hosts: osbs_masters_stg[0]:osbs_masters[0]
-  tags:
-    - osbs-labels-nodes
-  tasks:
-    - name: Add the worker label
-      command: "oc -n {{ osbs_worker_namespace }} label nodes {{ item }} worker=true --overwrite"
-      loop: "{{ groups['osbs_nodes_stg'] }}"
-      when: env == "staging"
-    - name: Add the worker label
-      command: "oc -n {{ osbs_worker_namespace }} label nodes {{ item }} worker=true --overwrite"
-      loop: "{{ groups['osbs_nodes'] }}"
-      when: env == "production"
-
-- name: Add the worker labels to the nodes aarch64
-  hosts: osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0]
-  tags:
-    - osbs-labels-nodes
-  tasks:
-    - name: Add the worker label
-      command: "oc -n {{ osbs_worker_namespace }} label nodes {{ item }} worker=true --overwrite"
-      loop: "{{ groups['osbs-aarch64-nodes-stg'] }}"
-      when: env == "staging"
-    - name: Add the worker label
-      command: "oc -n {{ osbs_worker_namespace }} label nodes {{ item }} worker=true --overwrite"
-      loop: "{{ groups['osbs-aarch64-nodes'] }}"
-      when: env == "production"