diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-19 18:59:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 18:59:43 -0700 |
| commit | 3eb3a30712edb771e65f37739d5ae6c2471295cc (patch) | |
| tree | 6bee00902b3f3edad9cbeca6faac72c77510f060 | |
| parent | 483f5676fd51a906354014c5c202001d2dea306e (diff) | |
| parent | f3b39ab5a882c2dcefe464c5fa99ef84b740dcae (diff) | |
| download | openshift-3eb3a30712edb771e65f37739d5ae6c2471295cc.tar.gz openshift-3eb3a30712edb771e65f37739d5ae6c2471295cc.tar.bz2 openshift-3eb3a30712edb771e65f37739d5ae6c2471295cc.tar.xz openshift-3eb3a30712edb771e65f37739d5ae6c2471295cc.zip | |
Merge pull request #5380 from mgugino-upstream-stage/fix-openshift-version-pkg-install
Automatic merge from submit-queue
Only install base openshift package on masters and nodes
Recent refactoring to remove openshift_common resulted
in base openshift rpm's being installed on more hosts
than previous. This situation results in hosts that
would otherwise not need access to openshift repositories
to require them.
This patch set results in only openshift_masters and
openshift_nodes to have the openshift base package installed.
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_version/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 7af6b25bc..1b186f181 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -1,4 +1,12 @@ --- +- name: Set version_install_base_package true on masters and nodes + hosts: oo_masters_to_config:oo_nodes_to_config + tasks: + - name: Set version_install_base_package true + set_fact: + version_install_base_package: True + when: version_install_base_package is not defined + # NOTE: requires openshift_facts be run - name: Determine openshift_version to configure on first master hosts: oo_first_master diff --git a/roles/openshift_version/defaults/main.yml b/roles/openshift_version/defaults/main.yml index 01a1a7472..53d10f1f8 100644 --- a/roles/openshift_version/defaults/main.yml +++ b/roles/openshift_version/defaults/main.yml @@ -1,2 +1,3 @@ --- 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 204abe27e..1ff99adf8 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -5,11 +5,15 @@ 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 + 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 |