summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-23 13:48:16 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-23 13:48:16 -0400
commit7fe575eb57be7ab230dd9cfee4d11c6be1fe480b (patch)
tree40036812e5a5f322ec900b4b81e566608c41054b /roles
parenta20098d3ae28110dd4d38ed4aa3a89af6cb72a01 (diff)
downloadopenshift-7fe575eb57be7ab230dd9cfee4d11c6be1fe480b.tar.gz
openshift-7fe575eb57be7ab230dd9cfee4d11c6be1fe480b.tar.bz2
openshift-7fe575eb57be7ab230dd9cfee4d11c6be1fe480b.tar.xz
openshift-7fe575eb57be7ab230dd9cfee4d11c6be1fe480b.zip
Remove base package install
Currently, base atomic-openshift package is installed for versioning. This doesn't appear to be necessary. This commit removes this step. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1504196
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_version/defaults/main.yml1
-rw-r--r--roles/openshift_version/tasks/main.yml10
2 files changed, 0 insertions, 11 deletions
diff --git a/roles/openshift_version/defaults/main.yml b/roles/openshift_version/defaults/main.yml
index 53d10f1f8..01a1a7472 100644
--- a/roles/openshift_version/defaults/main.yml
+++ b/roles/openshift_version/defaults/main.yml
@@ -1,3 +1,2 @@
---
openshift_protect_installed_version: True
-version_install_base_package: False
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index f4e9ff43a..1c8b9046c 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -5,16 +5,6 @@
is_containerized: "{{ openshift.common.is_containerized | default(False) | bool }}"
is_atomic: "{{ openshift.common.is_atomic | default(False) | bool }}"
-# This is only needed on masters and nodes; version_install_base_package
-# should be set by a play externally.
-- name: Install the base package for versioning
- package:
- name: "{{ openshift.common.service_type }}{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
- state: present
- when:
- - not is_containerized | bool
- - version_install_base_package | bool
-
# Block attempts to install origin without specifying some kind of version information.
# This is because the latest tags for origin are usually alpha builds, which should not
# be used by default. Users must indicate what they want.