From a534e0b447c65bcbeb5a6136a4a13925529220b2 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Fri, 21 Jul 2017 15:07:22 +0000
Subject: [PATCH] openshift-ansible fixes merged upstream, remove osbs work
 arounds

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 inventory/group_vars/osbs-stg                          | 10 +---------
 playbooks/groups/osbs-orchestrator-cluster.yml         |  8 ++++++++
 roles/ansible-ansible-openshift-ansible/tasks/main.yml |  6 +-----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 6d4338c64a..1e5c08ec56 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -22,15 +22,7 @@ osbs_client_conf_path: /etc/osbs.conf
 
 # openshift-ansible variables
 
-#
-# FIXME - Use my branch and fork for stage until this issue is resolved:
-#
-#   https://github.com/openshift/openshift-ansible/issues/4801
-#
-# oa_version: openshift-ansible-3.5.101-1
-#
-oa_version: fix-fedora-python-check-3.5.101
-
+oa_version: release-1.5
 oa_ssh_user: root
 oa_install_examples: false
 oa_containerized_deploy: false
diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml
index 9cd1434f76..4a7947feb7 100644
--- a/playbooks/groups/osbs-orchestrator-cluster.yml
+++ b/playbooks/groups/osbs-orchestrator-cluster.yml
@@ -60,6 +60,13 @@
         option: pipelining
         value: "True"
 
+    - name: Install necessary packages that openshift-ansible control host needs
+      package: name="{{ item }}" state=installed
+      with_items:
+        - ansible
+        - git
+        - java-1.8.0-openjdk-headless
+
 
 # This section sets up the SSL Certs for "public facing" which is how Koji will
 # interact with the OSBS Orchestration cluster. This is not needed on the worker
@@ -138,6 +145,7 @@
         - libselinux-python3
         - origin
         - python3-PyYAML
+        - java-1.8.0-openjdk-headless
 
     - name: Deploy controller public ssh keys to osbs cluster hosts
       authorized_key:
diff --git a/roles/ansible-ansible-openshift-ansible/tasks/main.yml b/roles/ansible-ansible-openshift-ansible/tasks/main.yml
index aafe87506b..fa8d06a255 100644
--- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml
+++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml
@@ -16,13 +16,9 @@
     version: "{{ openshift_ansible_version }}"
   when: env == "production"
 
-# FIXME - Use my branch and fork for stage until this issue is resolved:
-#
-#   https://github.com/openshift/openshift-ansible/issues/4801
-#
 - name: git clone the openshift-ansible repo
   git:
-    repo: "https://github.com/maxamillion/openshift-ansible.git"
+    repo: "https://github.com/openshift/openshift-ansible.git"
     dest: "{{ openshift_ansible_path }}"
     version: "{{ openshift_ansible_version }}"
   when: env == "staging"