From 06c808e70de3ec7c60400f0804f9308590a272e0 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 30 Nov 2022 13:37:13 -0800
Subject: [PATCH] Update iweb clouds.yaml for old and new openstacksdk

Due to changes in the internap cloud being renamed to iweb and back
again the history of the internap clouds.yaml profile is one of change.
Unfortunately, we need to talk to iweb specifically but the internap
profile in new openstack sdk talks to internap and things break.

Fix this by removing the use of the profile and setting the values
explicitly in our clouds.yaml files.

While this cloud is going away in about a month making this change is
still worthwile as it will allow us to use new openstacksdk on bridge
and nodepool to talk to iweb in the meantime.

Change-Id: I9f6c414115190ec5d25e0654b4da9cd9b9cbb957
---
 playbooks/templates/clouds/bridge_all_clouds.yaml.j2 | 6 ++++--
 playbooks/templates/clouds/nodepool_clouds.yaml.j2   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 4b68f74e5e..272111290d 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -46,8 +46,8 @@ clouds:
             - name: inap-17304-WAN1101
               routes_externally: True
   openstackci-iweb:
-    profile: internap
     auth:
+      auth_url: https://identity.api.cloud.iweb.com
       username: '{{ clouds.openstackci_internap_username }}'
       password: '{{ clouds.openstackci_internap_password }}'
       project_name: '{{ clouds.openstackci_internap_project_name }}'
@@ -57,9 +57,10 @@ clouds:
           networks:
             - name: inap-17301-WAN1102
               routes_externally: True
+    floating_ip_source: None
   openstackjenkins-iweb:
-    profile: internap
     auth:
+      auth_url: https://identity.api.cloud.iweb.com
       username: '{{ clouds.openstackjenkins_internap_username }}'
       password: '{{ clouds.openstackjenkins_internap_password }}'
       project_name: '{{ clouds.openstackjenkins_internap_project_name }}'
@@ -69,6 +70,7 @@ clouds:
           networks:
             - name: inap-17304-WAN1101
               routes_externally: True
+    floating_ip_source: None
   openstackci-ovh:
     regions:
       - GRA1
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 30e1c8f1e4..2de308d586 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -83,9 +83,9 @@ clouds:
             statsd:
               prefix: 'nodepool.task.inap-mtl01'
   iweb:
-    profile: internap
     api_timeout: 60
     auth:
+      auth_url: https://identity.api.cloud.iweb.com
       username: '{{ nodepool_internap_username }}'
       password: '{{ nodepool_internap_password }}'
       project_name: '{{ nodepool_internap_project }}'
@@ -98,6 +98,7 @@ clouds:
           metrics:
             statsd:
               prefix: 'nodepool.task.inap-mtl01'
+    floating_ip_source: None
   vexxhost:
     profile: vexxhost
     regions: