From e6fc9323f0549419d52294bd41b87daae8a74298 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Fri, 6 Nov 2015 16:16:03 -0500 Subject: Bug 1278863 - Error using openshift_pkg_version - Install correct version of package in openshift_master_ca - Remove duplicate yum tasks in openshift_node --- roles/openshift_master_ca/tasks/main.yml | 2 +- roles/openshift_node/tasks/main.yml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'roles') 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: -- cgit v1.2.3