diff options
author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-12-02 16:23:36 -0500 |
---|---|---|
committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-12-02 16:23:36 -0500 |
commit | f7835bc727bb2a290ebc42be9e16f3d775b2588b (patch) | |
tree | e40313defb290c23963d0abddd212b951c354baa /roles/openshift_node/tasks/main.yml | |
parent | e14da724f79e1fd75aea03bfab2179c7ef42c3e6 (diff) | |
parent | af009a7a51d7b6f5799a14c452cc7db92727135e (diff) | |
download | openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.gz openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.bz2 openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.xz openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.zip |
Merge pull request #966 from maxamillion/fedora
Fedora changes:
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 42d984a09..36bcc1a90 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -40,12 +40,23 @@ # problems because the rpms don't pin the version properly. - name: Install Node package yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_version }} state=present + when: ansible_pkg_mgr == "yum" + register: node_install_result + +- name: Install Node package + dnf: pkg={{ openshift.common.service_type }}-node{{ openshift_version }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_version }} state=present + when: ansible_pkg_mgr == "dnf" register: node_install_result - name: Install sdn-ovs package yum: pkg={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present register: sdn_install_result - when: openshift.common.use_openshift_sdn + when: ansible_pkg_mgr == "yum" and openshift.common.use_openshift_sdn + +- name: Install sdn-ovs package + dnf: pkg={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present + register: sdn_install_result + when: ansible_pkg_mgr == "dnf" and openshift.common.use_openshift_sdn # TODO: add the validate parameter when there is a validation command to run - name: Create the Node config |