diff options
| author | Adam Miller <admiller@redhat.com> | 2016-06-24 22:38:27 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2016-06-24 22:38:27 +0000 |
| commit | b110a98d10dd19f75cfb8fcbe6ef5a53d00021b2 (patch) | |
| tree | 85a769a0b2191847612dd62228474076b2ac4542 | |
| parent | a0bb154ac4574fd7172fdfd1010be4099eb837b9 (diff) | |
| download | ansible-b110a98d10dd19f75cfb8fcbe6ef5a53d00021b2.tar.gz ansible-b110a98d10dd19f75cfb8fcbe6ef5a53d00021b2.tar.xz ansible-b110a98d10dd19f75cfb8fcbe6ef5a53d00021b2.zip | |
remove copr all together from openshift install role
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | roles/osbs-install-openshift/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/osbs-install-openshift/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/osbs-install-openshift/tasks/method_fedora.yml | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/roles/osbs-install-openshift/defaults/main.yml b/roles/osbs-install-openshift/defaults/main.yml index fefe12d70..463f6530d 100644 --- a/roles/osbs-install-openshift/defaults/main.yml +++ b/roles/osbs-install-openshift/defaults/main.yml @@ -1,6 +1,6 @@ --- -# methods: copr, source -install_openshift_method: copr +# methods: copr, source, fedora +install_openshift_method: fedora # copr-specific variables diff --git a/roles/osbs-install-openshift/tasks/main.yml b/roles/osbs-install-openshift/tasks/main.yml index 2bcd73c73..ad0f13ee8 100644 --- a/roles/osbs-install-openshift/tasks/main.yml +++ b/roles/osbs-install-openshift/tasks/main.yml @@ -1,4 +1,7 @@ --- +- include: method_fedora.yml + when: install_openshift_method == 'fedora' + - include: method_copr.yml when: install_openshift_method == 'copr' diff --git a/roles/osbs-install-openshift/tasks/method_fedora.yml b/roles/osbs-install-openshift/tasks/method_fedora.yml new file mode 100644 index 000000000..ee11fde1a --- /dev/null +++ b/roles/osbs-install-openshift/tasks/method_fedora.yml @@ -0,0 +1,6 @@ +--- +- name: install openshift + action: "{{ ansible_pkg_mgr }} name={{ item }} state={{ osbs_update_packages | ternary('latest', 'present') }}" + with_items: + - origin-master + - origin-node |