From b110a98d10dd19f75cfb8fcbe6ef5a53d00021b2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 24 Jun 2016 22:38:27 +0000 Subject: remove copr all together from openshift install role Signed-off-by: Adam Miller --- roles/osbs-install-openshift/defaults/main.yml | 4 ++-- roles/osbs-install-openshift/tasks/main.yml | 3 +++ roles/osbs-install-openshift/tasks/method_fedora.yml | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 roles/osbs-install-openshift/tasks/method_fedora.yml 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 -- cgit