summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-06 16:16:03 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-06 16:16:06 -0500
commite6fc9323f0549419d52294bd41b87daae8a74298 (patch)
tree6105f37648b91b326ca432cd6aea2e957211d2b6
parentf50cb24856560880be33607323053d14916c5650 (diff)
downloadopenshift-e6fc9323f0549419d52294bd41b87daae8a74298.tar.gz
openshift-e6fc9323f0549419d52294bd41b87daae8a74298.tar.bz2
openshift-e6fc9323f0549419d52294bd41b87daae8a74298.tar.xz
openshift-e6fc9323f0549419d52294bd41b87daae8a74298.zip
Bug 1278863 - Error using openshift_pkg_version
- Install correct version of package in openshift_master_ca - Remove duplicate yum tasks in openshift_node
-rw-r--r--roles/openshift_master_ca/tasks/main.yml2
-rw-r--r--roles/openshift_node/tasks/main.yml9
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: