internet/ansible-collections-openstack
3
0
Fork 0
mirror of https://opendev.org/openstack/ansible-collections-openstack.git synced 2026-05-08 22:34:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inlined network_external variable

Browse Source 
Change-Id: I4cbbd84eaed99dae40c72fbdf567b480a1f268a4
This commit is contained in:
Jakob Meng
2023-01-11 15:48:21 +01:00
parent eaa26c6b9c
commit 5aaa41c9c4
7 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci/roles/router/defaults/main.yml
View File

@@ -19,7 +19,6 @@ expected_fields:
- updated_at
network_name: ansible_net
external_network_name: ansible_external_net
network_external: true
router_name: ansible_router
test_subnets:
- cloud: "{{ cloud }}"

34
ci/roles/router/tasks/main.yml
View File

@@ -331,9 +331,7 @@
cloud: "{{ cloud }}"
state: present
name: "{{ external_network_name }}"
external: "{{ network_external }}"
when:
- network_external
external: true
- name: Create subnet5
openstack.cloud.subnet:
@@ -342,8 +340,6 @@
network_name: "{{ external_network_name }}"
name: shade_subnet5
cidr: 10.6.6.0/24
when:
- network_external
- name: Update router (add external gateway)
openstack.cloud.router:
@@ -353,8 +349,6 @@
network: "{{ external_network_name }}"
interfaces:
- shade_subnet1
when:
- network_external
- name: Gather routers info
openstack.cloud.routers_info:
@@ -392,8 +386,6 @@
external_fixed_ips:
- subnet: shade_subnet5
ip: 10.6.6.100
when:
- network_external
- name: Gather routers info
openstack.cloud.routers_info:
@@ -409,8 +401,6 @@
- info.routers.0.name == router_name
- (info.routers.0.external_gateway_info.external_fixed_ips|length) == 1
- info.routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.100"
when:
- network_external
- name: Update router (add external fixed ips)
openstack.cloud.router:
@@ -426,8 +416,6 @@
ip: 10.6.6.100
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
- name: Update router (add external fixed ips) again
openstack.cloud.router:
@@ -442,8 +430,6 @@
ip: 10.6.6.100
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
register: router
- name: Assert idempotent module
@@ -465,8 +451,6 @@
- (info.routers.0.external_gateway_info.external_fixed_ips|length) == 2
- info.routers.0.external_gateway_info.external_fixed_ips|map(attribute='ip_address')|sort|list ==
["10.6.6.100", "10.6.6.101"]
when:
- network_external
- name: Update router (remove external fixed ips)
openstack.cloud.router:
@@ -479,8 +463,6 @@
external_fixed_ips:
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
- name: Update router (remove external fixed ips) again
openstack.cloud.router:
@@ -493,8 +475,6 @@
external_fixed_ips:
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
register: router
- name: Assert idempotent module
@@ -515,8 +495,6 @@
- info.routers.0.name == router_name
- (info.routers.0.external_gateway_info.external_fixed_ips|length) == 1
- info.routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.101"
when:
- network_external
- name: Update router (disable external snat)
openstack.cloud.router:
@@ -530,8 +508,6 @@
external_fixed_ips:
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
- name: Gather routers info
openstack.cloud.routers_info:
@@ -546,8 +522,6 @@
that:
- info.routers.0.name == router_name
- not info.routers.0.external_gateway_info.enable_snat
when:
- network_external
- name: Update router (disable external snat) again
openstack.cloud.router:
@@ -561,8 +535,6 @@
external_fixed_ips:
- subnet: shade_subnet5
ip: 10.6.6.101
when:
- network_external
register: router
- name: Assert idempotent module
@@ -727,8 +699,6 @@
cloud: "{{ cloud }}"
state: absent
name: shade_subnet5
when:
- network_external
- name: Delete subnets 1-4
openstack.cloud.subnet:
@@ -748,7 +718,5 @@
cloud: "{{ cloud }}"
state: absent
name: "{{ external_network_name }}"
when:
- network_external
- include_tasks: shared_network.yml