diff --git a/ci/roles/router/tasks/main.yml b/ci/roles/router/tasks/main.yml index baa70ea9..fb4cc168 100644 --- a/ci/roles/router/tasks/main.yml +++ b/ci/roles/router/tasks/main.yml @@ -384,7 +384,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.100 - name: Gather routers info @@ -412,7 +412,7 @@ external_gateway_info: network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.100 - subnet: shade_subnet5 ip: 10.6.6.101 @@ -426,7 +426,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.100 - subnet: shade_subnet5 ip: 10.6.6.101 @@ -461,7 +461,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.101 - name: Update router (remove external fixed ips) again @@ -473,7 +473,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.101 register: router @@ -506,7 +506,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.101 - name: Gather routers info @@ -533,7 +533,7 @@ - shade_subnet1 network: "{{ external_network_name }}" external_fixed_ips: - - subnet: shade_subnet5 + - subnet_id: shade_subnet5 ip: 10.6.6.101 register: router diff --git a/plugins/modules/router.py b/plugins/modules/router.py index c82819f4..de1535ce 100644 --- a/plugins/modules/router.py +++ b/plugins/modules/router.py @@ -461,7 +461,7 @@ class RouterModule(OpenStackModule): if ext_fixed_ips: for iface in ext_fixed_ips: subnet = self.conn.network.find_subnet( - iface['subnet'], ignore_missing=False, **filters) + iface['subnet_id'], ignore_missing=False, **filters) fip = dict(subnet_id=subnet.id) if 'ip_address' in iface: fip['ip_address'] = iface['ip_address']