From 7d08c277d7247edcff6a07ce44dc07f6f8099e60 Mon Sep 17 00:00:00 2001
From: Donny Davis <donny@fortnebula.com>
Date: Fri, 6 Mar 2020 15:15:56 -0500
Subject: [PATCH] Moving FortNebula to OpenEdge

Change-Id: Ia5caff34d3fafaffc459e7572a4eef6bd94422ea
---
 grafana/create-nodepool.sh                                | 2 +-
 .../{nodepool-fortnebula.yaml => nodepool-openedge.yaml}  | 8 ++++----
 nodepool/nl02.openstack.org.yaml                          | 6 +++---
 nodepool/nodepool.yaml                                    | 6 +++---
 zuul/site-variables.yaml                                  | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename grafana/{nodepool-fortnebula.yaml => nodepool-openedge.yaml} (97%)

diff --git a/grafana/create-nodepool.sh b/grafana/create-nodepool.sh
index b01bc5bc4f..cdc4bcba54 100755
--- a/grafana/create-nodepool.sh
+++ b/grafana/create-nodepool.sh
@@ -26,5 +26,5 @@ create Linaro 'linaro-*' nodepool-linaro.yaml
 create OVH 'ovh-*' nodepool-ovh.yaml
 create Vexxhost 'vexxhost-*' nodepool-vexxhost.yaml
 create Citycloud 'citycloud-*' nodepool-citycloud.yaml
-create FortNebula 'fortnebula-*' nodepool-fortnebula.yaml
+create OpenEdge 'openedge-*' nodepool-openedge.yaml
 create Airship-Citycloud 'airship-*' nodepool-airship-citycloud.yaml
diff --git a/grafana/nodepool-fortnebula.yaml b/grafana/nodepool-openedge.yaml
similarity index 97%
rename from grafana/nodepool-fortnebula.yaml
rename to grafana/nodepool-openedge.yaml
index b098a32efe..b658e20d68 100644
--- a/grafana/nodepool-fortnebula.yaml
+++ b/grafana/nodepool-openedge.yaml
@@ -3,12 +3,12 @@
 #
 
 dashboard:
-  title: 'Nodepool: FortNebula'
+  title: 'Nodepool: OpenEdge'
   templating:
     - name: region
       includeAll: true
       multi: true
-      query: stats.gauges.nodepool.provider.fortnebula-*
+      query: stats.gauges.nodepool.provider.openedge-*
       refresh: true
       type: query
   rows:
@@ -17,10 +17,10 @@ dashboard:
       panels:
         - title: Description
           content: |
-            FortNebula Nodepool Status
+            OpenEdge Nodepool Status
             ==========================
 
-            This dashboard monitors the status of the nodepool environment for FortNebula.
+            This dashboard monitors the status of the nodepool environment for OpenEdge.
 
             **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).**
             If you would like to make changes to this dashboard, please see the template in the `grafana` directory in
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 661c65f54e..0bf192ab7d 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -255,9 +255,9 @@ providers:
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
 
-  - name: fortnebula-regionone
-    region-name: 'regionOne'
-    cloud: fortnebula
+  - name: openedge-us-east
+    region-name: 'us-east'
+    cloud: openedge
     boot-timeout: 120
     launch-timeout: 300
     rate: 0.01
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index ccc613f213..2aab25f40b 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -106,9 +106,9 @@ providers:
     rate: 0.001
     diskimages: *provider_diskimages
 
-  - name: fortnebula-regionone
-    region-name: 'regionOne'
-    cloud: fortnebula
+  - name: openedge-us-east
+    region-name: 'us-east'
+    cloud: openedge
     rate: 0.001
     diskimages: *provider_diskimages
 
diff --git a/zuul/site-variables.yaml b/zuul/site-variables.yaml
index 0c0b403deb..c0562be7f8 100644
--- a/zuul/site-variables.yaml
+++ b/zuul/site-variables.yaml
@@ -4,7 +4,7 @@
 # new opendev.org based mirrors, but then eventually be removed once
 # all are updated.
 zuul_site_mirror_fqdn: >-
-  {%- if nodepool.region + "." + nodepool.cloud in [ "DFW.rax", "ORD.rax", "regionOne.fortnebula", "mtl01.inap", "RegionOne.linaro-us", "Kna1.airship-citycloud" ] -%}
+  {%- if nodepool.region + "." + nodepool.cloud in [ "DFW.rax", "ORD.rax", "us-east.openedge", "mtl01.inap", "RegionOne.linaro-us", "Kna1.airship-citycloud" ] -%}
   mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.opendev.org
   {%- else -%}
   mirror.{{ nodepool.region | lower }}.{{ nodepool.cloud | lower }}.openstack.org