From 9436bf2d4249a4328d1456812a0256f1c75614c1 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Jul 2017 02:38:04 +0000 Subject: [PATCH] add temp workaround for ansible-ansible-openshift-ansible in stage Signed-off-by: Adam Miller --- inventory/group_vars/osbs-stg | 11 ++++++++++- .../ansible-ansible-openshift-ansible/tasks/main.yml | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg index db314e2250..6d4338c64a 100644 --- a/inventory/group_vars/osbs-stg +++ b/inventory/group_vars/osbs-stg @@ -21,7 +21,16 @@ osbs_client_conf_path: /etc/osbs.conf # openshift-ansible variables -oa_version: openshift-ansible-3.5.97-1 + +# +# 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_ssh_user: root oa_install_examples: false oa_containerized_deploy: false diff --git a/roles/ansible-ansible-openshift-ansible/tasks/main.yml b/roles/ansible-ansible-openshift-ansible/tasks/main.yml index da3902ee03..aafe87506b 100644 --- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml +++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml @@ -14,6 +14,18 @@ repo: "https://github.com/openshift/openshift-ansible.git" dest: "{{ openshift_ansible_path }}" 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" + dest: "{{ openshift_ansible_path }}" + version: "{{ openshift_ansible_version }}" + when: env == "staging" - name: generate the inventory file template: