Skip to content

Commit 7c166cf

Browse files
Update agent to v1.37.2 if version is lower
1 parent 42c0ce3 commit 7c166cf

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

playbooks/roles/cloud-agent_update/tasks/el.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,32 @@
88
vars:
99
- major_version: "{{version.stdout.split('.')[1] }}"
1010
- minor_version: "{{version.stdout.split('.')[0] }}"
11+
- sub_version: "{{version.stdout.split('.')[2].split('-')[0] }}"
1112
yum:
12-
name: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/Yew5fbqcx5j-H_W_0BKHut2yEMb4DJ0u5LUEttGCcCB_F_5a1GnmaGK1wyksue1z/n/imagegen/b/agent_test/o/1.37.0/1/oracle-cloud-agent-1.37.0-10347.el8.x86_64.rpm"
13+
name: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/aV_mSl96KIiapAeZtsyo-SUcPCSurDfWaj06f4XVVoNKIsxvqlZ65guPTnMuNawR/n/imagegen/b/agent_test/o/1.37.0/3/oracle-cloud-agent-1.37.2-10459.el8.x86_64.rpm"
1314
state: present
1415
disable_gpg_check: yes
1516
when:
1617
- ansible_os_family == 'RedHat'
1718
- ansible_distribution_major_version == '8'
1819
- (minor_version | int <= 1) | bool
19-
- (major_version | int < 37) | bool
20+
- (major_version | int <= 37) | bool
21+
- (sub_version | int < 2) | bool
2022
- use_compute_agent | bool
2123

2224
- name: Install OCA v1.37 for OL7
2325
vars:
2426
- major_version: "{{version.stdout.split('.')[1] }}"
2527
- minor_version: "{{version.stdout.split('.')[0] }}"
28+
- sub_version: "{{version.stdout.split('.')[2].split('-')[0] }}"
2629
yum:
27-
name: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/97KluWDRcyG1IBdhGvCbKGkrq6TbGefawT8nJM5ko9SAOVfeSL9AOLk_UQCX0hs4/n/imagegen/b/agent_test/o/1.37.0/1/oracle-cloud-agent-1.37.0-10347.el7.x86_64.rpm"
30+
name: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/YmPlysZFl4CKrLTKN9Rj0CMPt8qiJgflvF4vXsOaaqOfcm5NMnyBJl_dlC0V0lTo/n/imagegen/b/agent_test/o/1.37.0/3/oracle-cloud-agent-1.37.2-10459.el7.x86_64.rpm"
2831
state: present
2932
disable_gpg_check: yes
3033
when:
3134
- ansible_os_family == 'RedHat'
3235
- ansible_distribution_major_version == '7'
3336
- (minor_version | int <= 1) | bool
34-
- (major_version | int < 37) | bool
37+
- (major_version | int <= 37) | bool
38+
- (sub_version | int < 2) | bool
3539
- use_compute_agent | bool

playbooks/roles/cloud-agent_update/tasks/ubuntu.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
vars:
99
- major_version: "{{version.stdout.split('.')[1] }}"
1010
- minor_version: "{{version.stdout.split('.')[0] }}"
11+
- sub_version: "{{version.stdout.split('.')[2].split('-')[0] }}"
1112
get_url:
12-
url: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/OySIUys5Zz0uFz-3XIWvpYKIM90gLWif7TRUBh2jUQd0R_bNyzlt1WzrkdJYfvYY/n/imagegen/b/agent_test/o/1.37.0/1/oracle-cloud-agent_1.37.0-2_amd64.snap"
13-
dest: "/tmp/oracle-cloud-agent_1.37.0-2_amd64.snap"
13+
url: "https://objectstorage.us-phoenix-1.oraclecloud.com/p/KVgO3DVFyTiLdCJLZUNYZlYCF5mcnaTjemmMUmyOB1Ln7Vkii-llp7QoQDiRF66T/n/imagegen/b/agent_test/o/1.37.0/4/oracle-cloud-agent_1.37.2-9_amd64.snap"
14+
dest: "/tmp/oracle-cloud-agent_1.37.2-9_amd64.snap"
1415
when :
1516
- (minor_version | int <= 1) | bool
16-
- (major_version | int < 37) | bool
17+
- (major_version | int <= 37) | bool
18+
- (sub_version | int < 2) | bool
1719
- use_compute_agent | bool
1820

1921
## The ansible snap module is not upgrading properly if the package already exists.
@@ -34,9 +36,12 @@
3436
vars:
3537
- major_version: "{{version.stdout.split('.')[1] }}"
3638
- minor_version: "{{version.stdout.split('.')[0] }}"
39+
- sub_version: "{{version.stdout.split('.')[2].split('-')[0] }}"
40+
3741
become: true
38-
shell: "snap install --classic --dangerous /tmp/oracle-cloud-agent_1.37.0-2_amd64.snap"
42+
shell: "snap install --classic --dangerous /tmp/oracle-cloud-agent_1.37.2-9_amd64.snap"
3943
when :
4044
- (minor_version | int <= 1) | bool
41-
- (major_version | int < 37) | bool
45+
- (major_version | int <= 37) | bool
46+
- (sub_version | int < 2) | bool
4247
- use_compute_agent | bool

0 commit comments

Comments
 (0)