diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-06 16:30:58 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-06 16:30:58 -0500 |
| commit | f1f22218739982f768e36cc2695a1b4ab5561ca7 (patch) | |
| tree | 630af12b99f4617965fa485255585cb7c898c553 | |
| parent | 379782816c11498358f1cc2101839bb2b8775d7e (diff) | |
| parent | e6fc9323f0549419d52294bd41b87daae8a74298 (diff) | |
| download | openshift-f1f22218739982f768e36cc2695a1b4ab5561ca7.tar.gz openshift-f1f22218739982f768e36cc2695a1b4ab5561ca7.tar.bz2 openshift-f1f22218739982f768e36cc2695a1b4ab5561ca7.tar.xz openshift-f1f22218739982f768e36cc2695a1b4ab5561ca7.zip | |
Merge pull request #837 from detiber/bz1278863
Bug 1278863 - Error using openshift_pkg_version
| -rw-r--r-- | roles/openshift_master_ca/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml index 0738048d3..314f068e7 100644 --- a/roles/openshift_master_ca/tasks/main.yml +++ b/roles/openshift_master_ca/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install the base package for admin tooling - yum: pkg={{ openshift.common.service_type }} state=present + yum: pkg={{ openshift.common.service_type }}{{ openshift_version }} state=present register: install_result - name: Reload generated facts diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index c455a09f1..7525c12f6 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -45,15 +45,6 @@ register: sdn_install_result when: openshift.common.use_openshift_sdn -- name: Install Node package - yum: pkg={{ openshift.common.service_type }}-node state=present - register: node_install_result - -- name: Install sdn-ovs package - yum: pkg={{ openshift.common.service_type }}-sdn-ovs state=present - register: sdn_install_result - when: openshift.common.use_openshift_sdn - # TODO: add the validate parameter when there is a validation command to run - name: Create the Node config template: |