From fc7785239ad908db350836749e9b8d8598903b2f Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Mon, 7 Aug 2017 16:18:49 +0000
Subject: [PATCH] re-enable osbs-client role for osbs-orchestrator-cluster

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 .../groups/osbs-orchestrator-cluster.yml      | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index 17313823c6..0b8732cfd5 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -661,40 +661,39 @@
     - name: systemctl daemon-reload
       shell: 'systemctl daemon-reload'
 
-# FIXME - Not sure if this is needed anymore because of the osbs-namespace role
-#  roles:
-#    - {
-#      role: osbs-client,
-#        general: {
-#          verbose: 0,
-#          build_json_dir: '/etc/osbs/input/',
-#          openshift_required_version: 1.1.0,
-#        },
-#        default: {
-#          username: "{{ osbs_koji_stg_username }}",
-#          password: "{{ osbs_koji_stg_password }}",
-#          koji_use_kerberos: True,
-#          koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
-#          koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
-#          openshift_url: 'https://{{osbs_url}}/',
-#          registry_uri: 'https://{{candidate_registry}}/v2',
-#          source_registry_uri: 'https://{{stable_registry}}/v2',
-#          build_host: '{{osbs_url}}',
-#          koji_root: '{{koji_root}}',
-#          koji_hub: '{{koji_hub}}',
-#          sources_command: 'fedpkg sources',
-#          build_type: 'prod',
-#          authoritative_registry: '{{stable_registry}}',
-#          vendor: 'Fedora Project',
-#          verify_ssl: true,
-#          use_auth: true,
-#          builder_use_auth: true,
-#          distribution_scope: 'private',
-#          registry_api_versions: 'v2',
-#          builder_openshift_url: 'https://{{osbs_url}}'
-#        },
-#      when: env == "staging"
-#      }
+  roles:
+    - {
+      role: osbs-client,
+        general: {
+          verbose: 0,
+          build_json_dir: '/etc/osbs/input/',
+          openshift_required_version: 1.1.0,
+        },
+        default: {
+          username: "{{ osbs_koji_stg_username }}",
+          password: "{{ osbs_koji_stg_password }}",
+          koji_use_kerberos: True,
+          koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
+          koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
+          openshift_url: 'https://{{osbs_url}}/',
+          registry_uri: 'https://{{candidate_registry}}/v2',
+          source_registry_uri: 'https://{{stable_registry}}/v2',
+          build_host: '{{osbs_url}}',
+          koji_root: '{{koji_root}}',
+          koji_hub: '{{koji_hub}}',
+          sources_command: 'fedpkg sources',
+          build_type: 'prod',
+          authoritative_registry: '{{stable_registry}}',
+          vendor: 'Fedora Project',
+          verify_ssl: true,
+          use_auth: true,
+          builder_use_auth: true,
+          distribution_scope: 'private',
+          registry_api_versions: 'v2',
+          builder_openshift_url: 'https://{{osbs_url}}'
+        },
+      when: env == "staging"
+      }
 
   tasks:
     - name: copy docker iptables script