Skip to content

Commit 4fc2de7

Browse files
committed
Finish updating the role_prefix
The update to move to role_prefix was incomplete. There was also an issue with the networking_stack that was fixed as well.
1 parent cfe72d5 commit 4fc2de7

File tree

7 files changed

+35
-28
lines changed

7 files changed

+35
-28
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ Once installed, you can reference the cloud.azure_ops collection content by its
6969
ansible.builtin.include_role:
7070
name: cloud.azure_ops.azure_load_balancer_with_public_ip
7171
vars:
72-
operation: create
73-
azure_resource_group: "{{ resource_group }}"
74-
azure_load_balancer:
75-
name: "{{ resource_group }}-lb"
72+
azure_load_balancer_with_public_ip_operation: create
73+
azure_load_balancer_with_public_ip_azure_resource_group: "{{ resource_group }}"
74+
azure_load_balancer_with_public_ip_load_balancer:
75+
name: "{{ resource_group }}-lb"
7676
```
7777
7878
### See Also
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
bugfixes:
2+
- Update README.md with proper variable names in example
3+
- Update playbooks/roles/scale_virtual_machine/tasks/main.yml to use correct operation variable
4+
- Fix syntax in roles/azure_manage_networking_stack/README.md
5+
- Use correct variables in roles/azure_manage_networking_stack/tasks/create.yml
6+
- Update roles/azure_manage_security_group/tasks/main.yml to use correct operation variable
7+
- Update roles/azure_virtual_machine_with_public_ip/tasks/main.yml to use correct prefix vars

playbooks/roles/scale_virtual_machine/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
msg: Azure region must be defined as scale_virtual_machine_region
1010
when: scale_virtual_machine_region is not defined
1111

12-
- name: Include operation tasks
13-
ansible.builtin.include_tasks: "{{ operation }}.yml"
12+
- name: Include scale_virtual_machine_operation tasks
13+
ansible.builtin.include_tasks: "{{ scale_virtual_machine_operation }}.yml"

roles/azure_manage_networking_stack/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Example Playbook
4343
azure_manage_networking_stack_vnet_address_prefixes_cidr:
4444
- "10.1.0.0/16"
4545
- "172.100.0.0/16"
46-
azure_manage_networking_stack_subnet_address_prefixes_cidr
46+
azure_manage_networking_stack_subnet_address_prefixes_cidr:
4747
- "172.100.0.0/8"
4848
azure_manage_networking_stack_tags:
4949
tag0: "tag0"
@@ -59,4 +59,4 @@ See [LICENCE](https://github.com/redhat-cop/cloud.azure_ops/blob/main/LICENSE) t
5959
Author Information
6060
------------------
6161

62-
- Ansible Cloud Content Team
62+
- Ansible Cloud Content Team
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Check that resource group exists
33
azure.azcollection.azure_rm_resourcegroup_info:
4-
name: "{{ azure_resource_group }}"
4+
name: "{{ azure_manage_networking_stack_resource_group }}"
55
register: result
66

77
- name: Create resource group when it does not exists
@@ -16,16 +16,16 @@
1616

1717
- name: Create azure virtual network
1818
azure.azcollection.azure_rm_virtualnetwork:
19-
location: "{{ azure_region }}"
20-
name: "{{ azure_virtual_network }}"
21-
address_prefixes_cidr: "{{ azure_vnet_address_prefixes_cidr }}"
22-
resource_group: "{{ azure_resource_group }}"
23-
tags: "{{ azure_tags | default(omit) }}"
19+
location: "{{ azure_manage_networking_stack_region }}"
20+
name: "{{ azure_manage_networking_stack_virtual_network }}"
21+
address_prefixes_cidr: "{{ azure_manage_networking_stack_vnet_address_prefixes_cidr }}"
22+
resource_group: "{{ azure_manage_networking_stack_resource_group }}"
23+
tags: "{{ azure_manage_networking_stack_tags | default(omit) }}"
2424

2525
- name: Create azure subnet
2626
azure.azcollection.azure_rm_subnet:
27-
name: "{{ azure_subnet }}"
28-
virtual_network: "{{ azure_virtual_network }}"
29-
address_prefix_cidr: "{{ azure_subnet_address_prefixes_cidr }}"
30-
resource_group: "{{ azure_resource_group }}"
31-
security_group: "{{ azure_security_group | default(omit) }}"
27+
name: "{{ azure_manage_networking_stack_subnet }}"
28+
virtual_network: "{{ azure_manage_networking_stack_virtual_network }}"
29+
address_prefixes_cidr: "{{ azure_manage_networking_stack_subnet_address_prefixes_cidr }}"
30+
resource_group: "{{ azure_manage_networking_stack_resource_group }}"
31+
security_group: "{{ azure_manage_networking_stack_security_group | default(omit) }}"

roles/azure_manage_security_group/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Check operation validation
33
ansible.builtin.fail:
4-
msg: Please provide operation as 'create' or 'delete'
4+
msg: Please provide azure_manage_security_group_operation as 'create' or 'delete'
55
when: azure_manage_security_group_operation not in ['create', 'delete']
66

77
- name: Check resource group name

roles/azure_virtual_machine_with_public_ip/tasks/main.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
- name: Ensure vm name is defined
1313
ansible.builtin.fail:
14-
msg: "Missing parameter: key 'name' not found in azure_virtual_machine_with_public_ip_operation_vm"
15-
when: azure_virtual_machine_with_public_ip_operation_vm.name is not defined
14+
msg: "Missing parameter: key 'name' not found in azure_virtual_machine_with_public_ip_vm"
15+
when: azure_virtual_machine_with_public_ip_vm.name is not defined
1616

1717
- name: Replace invalid chars in name
1818
ansible.builtin.set_fact:
19-
vm_name: "{{ azure_virtual_machine_with_public_ip_operation_vm.name | regex_replace('[^a-zA-Z0-9]', '-') }}"
19+
vm_name: "{{ azure_virtual_machine_with_public_ip_vm.name | regex_replace('[^a-zA-Z0-9]', '-') }}"
2020

2121
- name: Get resource group info
2222
azure.azcollection.azure_rm_resourcegroup_info:
@@ -28,28 +28,28 @@
2828
resource_group: "{{ azure_virtual_machine_with_public_ip_resource_group }}"
2929
name: "{{ vm_name }}"
3030
started: false
31-
when: operation == 'power_off'
31+
when: azure_virtual_machine_with_public_ip_operation == 'power_off'
3232

3333
- name: Deallocate VM
3434
azure.azcollection.azure_rm_virtualmachine:
3535
resource_group: "{{ azure_virtual_machine_with_public_ip_resource_group }}"
3636
name: "{{ vm_name }}"
3737
allocated: false
38-
when: operation == 'deallocate'
38+
when: azure_virtual_machine_with_public_ip_operation == 'deallocate'
3939

4040
- name: Power On VM
4141
azure.azcollection.azure_rm_virtualmachine:
4242
resource_group: "{{ azure_virtual_machine_with_public_ip_resource_group }}"
4343
name: "{{ vm_name }}"
44-
when: operation == 'power_on'
44+
when: azure_virtual_machine_with_public_ip_operation == 'power_on'
4545

4646
- name: Restart VM
4747
azure.azcollection.azure_rm_virtualmachine:
4848
resource_group: "{{ azure_virtual_machine_with_public_ip_resource_group }}"
4949
name: "{{ vm_name }}"
5050
restarted: true
51-
when: operation == 'restart'
51+
when: azure_virtual_machine_with_public_ip_operation == 'restart'
5252

5353
- name: Create or delete VM
5454
ansible.builtin.include_tasks: "{{ azure_virtual_machine_with_public_ip_operation }}.yml"
55-
when: operation in ['create', 'delete']
55+
when: azure_virtual_machine_with_public_ip_operation in ['create', 'delete']

0 commit comments

Comments
 (0)