diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-25 16:29:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 16:29:44 -0400 |
| commit | 22627cb5e395f9833e2116f7f57970fe819ddc20 (patch) | |
| tree | cf12ef02f9e2aaaf4a80d55f5ce018f2bd7801bd /roles | |
| parent | 8c85dd660d5b380edb8e91f90505b43a70bf871e (diff) | |
| parent | 7fe575eb57be7ab230dd9cfee4d11c6be1fe480b (diff) | |
| download | openshift-22627cb5e395f9833e2116f7f57970fe819ddc20.tar.gz openshift-22627cb5e395f9833e2116f7f57970fe819ddc20.tar.bz2 openshift-22627cb5e395f9833e2116f7f57970fe819ddc20.tar.xz openshift-22627cb5e395f9833e2116f7f57970fe819ddc20.zip | |
Merge pull request #5850 from mgugino-upstream-stage/remove-base-package
Remove base package install
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_version/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 10 |
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. |