Skip to content

Commit 5cf91c9

Browse files
committed
Corrected synax/logic for assigning my_compartment_id for olvm build
Signed-off-by: Jon-Eric Eliker <[email protected]>
1 parent da81f9c commit 5cf91c9

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

olvm/create_instance.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
debug_enabled: false
3030

3131
tasks:
32-
3332
- name: Get location of oci_config
3433
ansible.builtin.set_fact:
3534
oci_config_file: "{{ lookup('env', 'HOME') + '/.oci/config' }}"
@@ -86,7 +85,7 @@
8685
env_lookup: "{{ lookup('ansible.builtin.env', 'OCI_COMPARTMENT_OCID') }}"
8786
ini_lookup: "{{ lookup('ini', 'compartment-id section={{ oci_config_section }} file={{ oci_config_file }}') }}"
8887
ansible.builtin.set_fact:
89-
my_compartment_id: "{{ compartment_id | default(env_lookup, true | default(ini_lookup, true)) }}"
88+
my_compartment_id: "{{ compartment_id | default(env_lookup, true) | default(ini_lookup, true) }}"
9089

9190
- name: Create oci state file
9291
ansible.builtin.file:
@@ -112,7 +111,7 @@
112111

113112
- name: Generate random hex string
114113
vars:
115-
hex_chars: '0123456789abcdef'
114+
hex_chars: "0123456789abcdef"
116115
ansible.builtin.set_fact:
117116
vcn_code: "{{ query('community.general.random_string', upper=false, lower=false, override_special=hex_chars, numbers=false) }}"
118117

@@ -147,7 +146,7 @@
147146
vcn_id: "{{ my_vcn_id }}"
148147
is_enabled: true
149148
display_name: "Internet Gateway-OLV-VCN"
150-
state: 'present'
149+
state: "present"
151150
register: result
152151
retries: 10
153152
delay: 30
@@ -200,7 +199,7 @@
200199
- service_id: "{{ my_service_id }}"
201200
vcn_id: "{{ my_vcn_id }}"
202201
display_name: "Service Gateway-OLV-VCN"
203-
state: 'present'
202+
state: "present"
204203
register: result
205204
retries: 10
206205
delay: 30
@@ -224,11 +223,10 @@
224223
vcn_id: "{{ my_vcn_id }}"
225224
display_name: "Default Route Table for OLV-VCN"
226225
route_rules:
227-
-
228-
network_entity_id: "{{ my_internet_gateway_id }}"
226+
- network_entity_id: "{{ my_internet_gateway_id }}"
229227
destination: "0.0.0.0/0"
230228
destination_type: CIDR_BLOCK
231-
state: 'present'
229+
state: "present"
232230
register: result
233231
retries: 10
234232
delay: 30
@@ -252,11 +250,10 @@
252250
vcn_id: "{{ my_vcn_id }}"
253251
display_name: "Route Table for Private Subnet-OLV-VCN"
254252
route_rules:
255-
-
256-
network_entity_id: "{{ my_service_gateway_id }}"
253+
- network_entity_id: "{{ my_service_gateway_id }}"
257254
destination: "{{ my_service_cidr_block }}"
258255
destination_type: SERVICE_CIDR_BLOCK
259-
state: 'present'
256+
state: "present"
260257
register: result
261258
retries: 10
262259
delay: 30
@@ -487,7 +484,6 @@
487484
gather_facts: false
488485

489486
tasks:
490-
491487
- name: Print instance details
492488
ansible.builtin.debug:
493489
msg:

0 commit comments

Comments
 (0)