diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-10 17:05:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 17:05:42 -0500 |
| commit | 21c6da3a052e8f0df509458bbaa6abc659874f0e (patch) | |
| tree | 1e91dc2d15c02050f2f49c3f0e3d48b2f6069e4d /roles | |
| parent | 3041060af052648c772a34e4e9cf25f0ce14bf77 (diff) | |
| parent | 870b4b66cb8cd8a1accd3d1964f2f40a719403ed (diff) | |
| download | openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.gz openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.bz2 openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.xz openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.zip | |
Merge pull request #6683 from mgugino-upstream-stage/fix-pkg_version
Add defaults for openshift_pkg_version
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/upgrade/rpm_upgrade.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/rpm_upgrade.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml index f72710832..7870f43e2 100644 --- a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml +++ b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml @@ -12,11 +12,11 @@ package: name={{ master_pkgs | join(',') }} state=present vars: master_pkgs: - - "{{ openshift_service_type }}{{ openshift_pkg_version }}" - - "{{ openshift_service_type }}-master{{ openshift_pkg_version }}" - - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}" - - "{{ openshift_service_type }}-sdn-ovs{{ openshift_pkg_version }}" - - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}" - - "tuned-profiles-{{ openshift_service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}{{ openshift_pkg_version | default('') }}" + - "{{ openshift_service_type }}-master{{ openshift_pkg_version | default('') }}" + - "{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}" + - "{{ openshift_service_type }}-sdn-ovs{{ openshift_pkg_version | default('') }}" + - "{{ openshift_service_type }}-clients{{ openshift_pkg_version | default('') }}" + - "tuned-profiles-{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}" register: result until: result is succeeded diff --git a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml index 91a358095..d4b47bb9e 100644 --- a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml +++ b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml @@ -12,7 +12,7 @@ until: result is succeeded vars: openshift_node_upgrade_rpm_list: - - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}" - "PyYAML" - "dnsmasq" diff --git a/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml b/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml index c9094e05a..ef5d8d662 100644 --- a/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml +++ b/roles/openshift_node/tasks/upgrade/rpm_upgrade_install.yml @@ -14,6 +14,6 @@ until: result is succeeded vars: openshift_node_upgrade_rpm_list: - - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-node{{ openshift_pkg_version | default('') }}" - "PyYAML" - "openvswitch" |