From 6b190a4751dba2c10b7a83e30f77bfd85a2c7213 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 22 Apr 2021 09:21:04 -0700 Subject: [PATCH] Use External inmotion cloud network for zuul nodes We have limited ipv4 address space in this cloud. Currently we can do about 6 IP addresses for test nodes after we account for network infrastructure and the mirror. By switching these instances to using the external network directly we can clean up some of the neutron network infrastructure which we think may free up 2 more IP addresses. That should get us our originally intended max-servers of 8. Change-Id: I705ff082ff06ae1c97f4c229a22893e6d87d206d --- inventory/service/host_vars/bridge.openstack.org.yaml | 6 ------ playbooks/templates/clouds/nodepool_clouds.yaml.j2 | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index 461cebca4b..2266896475 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -361,9 +361,3 @@ cloud_launcher_clouds: profiles: - openstackci-keypairs - openstackci-security - - opendevzuul-networking - routers: - - name: opendevzuul-router1 - network: External - interfaces: - - opendevzuul-subnet1 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index cfdc665562..b5b24a058d 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -161,7 +161,12 @@ clouds: image_format: 'raw' inmotion: regions: - - iad3 + - name: iad3 + values: + networks: + - name: External + routes_externally: true + default_interface: true auth: auth_url: 'https://173.231.255.228:5000' username: '{{ nodepool_inmotion_username }}'