From 50df518da344e09fbfc72fde827c4fed7b5845da Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Wed, 19 Jul 2017 02:52:47 +0000
Subject: [PATCH] remove duplicate osbs-stg group vars

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 inventory/group_vars/osbs-orchestrators-stg | 30 ---------------------
 inventory/group_vars/osbs-stg               |  8 ------
 2 files changed, 38 deletions(-)

diff --git a/inventory/group_vars/osbs-orchestrators-stg b/inventory/group_vars/osbs-orchestrators-stg
index e89f8d4f3b..ed97d539c0 100644
--- a/inventory/group_vars/osbs-orchestrators-stg
+++ b/inventory/group_vars/osbs-orchestrators-stg
@@ -1,31 +1 @@
 ---
-osbs_manage_firewalld: false
-osbs_namespace: "osbs"
-# Allow 'oc' command to find its configuration file
-osbs_kubeconfig_path: /etc/origin/master/admin.kubeconfig
-osbs_environment:
-  HOME: "{{ lookup('env', 'HOME') }}"
-  KUBECONFIG: "{{ osbs_kubeconfig_path }}"
-osbs_readonly_users:
-- "system:serviceaccount:{{ osbs_namespace }}:metrics"
-osbs_readonly_groups:
-- "system:authenticated"
-osbs_readwrite_groups: []
-osbs_readwrite_users:
-- "{{ ansible_hostname }}"
-- "system:serviceaccount:{{ osbs_namespace }}:default"
-- "system:serviceaccount:{{ osbs_namespace }}:builder"
-osbs_admin_users:
-- kevin
-- puiterwijk
-- maxamillion
-- dgilmore
-osbs_admin_groups: []
-env: prod
-osbs_ha_install: true
-osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}"
-
-
-#nodeselectors
-osbs_orchestrator_default_nodeselector: "orchestrator=true"
-osbs_worker_default_nodeselector: "worker=true"
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 7c453006af..db314e2250 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -84,13 +84,6 @@ build_json_dir: /usr/share/osbs
 sources_command: fedpkg sources
 vendor: Fedora Project
 
-#nodeselectors
-osbs_orchestrator_default_nodeselector: "orchestrator=true"
-osbs_worker_default_nodeselector: "worker=true"
-
-build_json_dir: /usr/share/osbs
-
-
 osbs_manage_firewalld: false
 
 kubeconfig_path: /etc/origin/master/admin.kubeconfig
@@ -114,7 +107,6 @@ os_admin_users:
 os_admin_groups: []
 osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}"
 
-
 #nodeselectors
 osbs_orchestrator_default_nodeselector: "orchestrator=true"
 osbs_worker_default_nodeselector: "worker=true"