diff options
| author | Adam Miller <admiller@redhat.com> | 2017-08-18 16:31:10 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-08-18 16:34:20 +0000 |
| commit | 11ace40beb77efa884ad799804ceda6adf28c053 (patch) | |
| tree | 66dded08965fcb786b5269a85e4ed84f4c2239fb | |
| parent | a3acf5ecb34d51e0c9170b7c1a970dab37f55ddc (diff) | |
| download | ansible-11ace40beb77efa884ad799804ceda6adf28c053.tar.gz ansible-11ace40beb77efa884ad799804ceda6adf28c053.tar.xz ansible-11ace40beb77efa884ad799804ceda6adf28c053.zip | |
use my openshift-ansible fork in stage until changes merge upstream
We also need those changes backported to the release-3.6 branch
https://github.com/openshift/openshift-ansible/pull/5101
https://github.com/openshift/openshift-ansible/pull/5129
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | inventory/group_vars/osbs-stg | 8 | ||||
| -rw-r--r-- | roles/ansible-ansible-openshift-ansible/tasks/main.yml | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg index 239b44781..96f3981cd 100644 --- a/inventory/group_vars/osbs-stg +++ b/inventory/group_vars/osbs-stg @@ -22,7 +22,13 @@ osbs_client_conf_path: /etc/osbs.conf # openshift-ansible variables -oa_version: release-3.6 +# Need to use this special branch on my fork for stage until these are merged +# upstream and backported to the release-3.6 branch +# +# https://github.com/openshift/openshift-ansible/pull/5101 +# https://github.com/openshift/openshift-ansible/pull/5129 +oa_version: 3.6-add-dnf-support + 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 fa8d06a25..34140c9e3 100644 --- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml +++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml @@ -16,9 +16,14 @@ version: "{{ openshift_ansible_version }}" when: env == "production" +# Need to use my fork in stage until these are merged upstream and backported +# to the release-3.6 branch +# +# https://github.com/openshift/openshift-ansible/pull/5101 +# https://github.com/openshift/openshift-ansible/pull/5129 - name: git clone the openshift-ansible repo git: - repo: "https://github.com/openshift/openshift-ansible.git" + repo: "https://github.com/maxamillion/openshift-ansible" dest: "{{ openshift_ansible_path }}" version: "{{ openshift_ansible_version }}" when: env == "staging" |