Skip to content

Commit 278dd64

Browse files
authored
Merge pull request #530 from rajan-mis/master_license_sles
Fixed sles license upgrade issue
2 parents ee75321 + ad189f0 commit 278dd64

File tree

1 file changed

+26
-8
lines changed

1 file changed

+26
-8
lines changed

roles/core/upgrade/tasks/install_license_repository.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,35 @@
4141
- ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
4242
- scale_gpfs_license_pkg is defined
4343

44-
- name: upgrade | Find GPFS License package
45-
set_fact:
46-
scale_gpfs_license_package: "{{ package_name.stdout_lines.0[9:] }}"
44+
- block:
45+
- name: upgrade | Find GPFS License package
46+
set_fact:
47+
scale_gpfs_license_package: "{{ package_name.stdout_lines.0[9:] }}"
48+
when:
49+
- scale_gpfs_license_pkg is not defined
50+
51+
- name: upgrade | Extract license package name
52+
set_fact:
53+
scale_gpfs_license_package: "{{ scale_gpfs_license_pkg }}"
54+
when:
55+
- scale_gpfs_license_pkg is defined
4756
when:
48-
- ansible_pkg_mgr == 'apt'
57+
- ansible_pkg_mgr == 'apt'
4958

50-
- name: upgrade | Find GPFS License package
51-
set_fact:
52-
scale_gpfs_license_package: "{{ package_name_version_zypp.stdout }}"
59+
- block:
60+
- name: upgrade | Find GPFS License package
61+
set_fact:
62+
scale_gpfs_license_package: "{{ package_name_version_zypp.stdout }}"
63+
when:
64+
- scale_gpfs_license_pkg is not defined
65+
66+
- name: upgrade | Extract license package name
67+
set_fact:
68+
scale_gpfs_license_package: "{{ scale_gpfs_license_pkg }}"
69+
when:
70+
- scale_gpfs_license_pkg is defined
5371
when:
54-
- ansible_pkg_mgr == 'zypper'
72+
- ansible_pkg_mgr == 'zypper'
5573

5674
- name: upgrade | Add GPFS license packages to list
5775
set_fact:

0 commit comments

Comments
 (0)