Skip to content

Commit a065a19

Browse files
authored
Merge pull request #52 from bgraef/main
merge dnf retry and idempotency instance fix in ol
2 parents 535e41f + cfb6d86 commit a065a19

File tree

8 files changed

+29
-24
lines changed

8 files changed

+29
-24
lines changed

ol/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
-
3232
name: "OS Management Service Agent"
3333
desired_state: DISABLED
34+
key_by: [compartment_id, availability_domain, display_name]
3435
register: result
3536
vars:
3637
timestamp: "{{ now().strftime('%Y%m%d-%H%M%S') }}"

ol/create_instance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
msg: "{{ my_region_id }}"
5959
when: debug_enabled
6060

61-
- name: Get list availbility domains
61+
- name: Get list availability domains
6262
oracle.oci.oci_identity_availability_domain_facts:
6363
compartment_id: "{{ my_tenancy_id }}"
6464
region: "{{ my_region_id }}"

ol/provision_kvm.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
- cockpit-machines
2424
state: present
2525
when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
26+
retries: 5
27+
delay: 10
2628

2729
- name: Install Oracle Linux 9 virtualization packages
2830
ansible.builtin.dnf:
@@ -36,6 +38,8 @@
3638
- cockpit-machines
3739
state: present
3840
when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '9'
41+
retries: 5
42+
delay: 10
3943

4044
- name: Start and enable Oracle Linux 8 monolithic virtualization services
4145
ansible.builtin.systemd:

ol/provision_podman.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
- curl
2121
state: present
2222
when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
23+
retries: 5
24+
delay: 10
2325

2426
- name: Install Oracle Linux 9 container tools packages
2527
ansible.builtin.dnf:
@@ -30,3 +32,5 @@
3032
- curl
3133
state: present
3234
when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '9'
35+
retries: 5
36+
delay: 10

ol/provision_vbox.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
name: oracle-epel-release-el8
1818
state: present
1919
when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
20+
retries: 5
21+
delay: 10
2022

2123
- name: Enable ol8_developer_EPEL repo
2224
ansible.builtin.command:
@@ -34,6 +36,8 @@
3436
- perl
3537
- xcb-util-cursor
3638
state: present
39+
retries: 5
40+
delay: 10
3741

3842
- name: Add virtualbox repo keys
3943
ansible.builtin.rpm_key:
@@ -50,6 +54,8 @@
5054
ansible.builtin.dnf:
5155
name: "VirtualBox-{{ virtualbox_version }}"
5256
state: present
57+
retries: 5
58+
delay: 10
5359

5460
- name: Check if extension pack is already installed
5561
ansible.builtin.shell: |

ol/provision_vnc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
ansible.builtin.dnf:
1717
name: '@Server with GUI'
1818
state: present
19+
retries: 5
20+
delay: 10
1921

2022
- name: Installing the vnc package
2123
ansible.builtin.dnf:
2224
name:
2325
- tigervnc-server
2426
- tigervnc-server-module
2527
state: present
28+
retries: 5
29+
delay: 10
2630

2731
- name: Set systemd default boot target to graphical.target
2832
ansible.builtin.file:

ol/requirements.yml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,10 @@
77
# roles:
88

99
collections:
10-
- name: https://github.com/ansible-collections/community.general.git
11-
type: git
12-
version: main
13-
14-
- name: https://github.com/ansible-collections/ansible.posix.git
15-
type: git
16-
version: main
17-
18-
- name: https://github.com/oracle/oci-ansible-collection.git
19-
type: git
20-
version: master
21-
22-
- name: https://github.com/ansible-collections/community.postgresql.git
23-
type: git
24-
version: main
25-
26-
- name: https://github.com/ansible-collections/community.crypto.git
27-
type: git
28-
version: main
29-
30-
- name: https://github.com/ansible-collections/community.libvirt.git
31-
type: git
32-
version: main
10+
- ansible.posix
11+
- community.general
12+
- community.postgresql
13+
- community.crypto
14+
- freeipa.ansible_freeipa
15+
- community.libvirt
16+
- oracle.oci

ol/update_all_rpms.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
state: latest
1919
update_only: true
2020
when: ansible_distribution == 'OracleLinux'
21+
retries: 5
22+
delay: 10
2123

2224
- name: Check if a reboot is required
2325
ansible.builtin.command: /usr/bin/needs-restarting -r

0 commit comments

Comments
 (0)