diff --git a/grafana/create-nodepool.sh b/grafana/create-nodepool.sh index 09d694f3ac..7389e0f7bb 100755 --- a/grafana/create-nodepool.sh +++ b/grafana/create-nodepool.sh @@ -20,7 +20,6 @@ function create { } create Rackspace 'rax-*' nodepool-rax.yaml -create Linaro 'linaro-*' nodepool-linaro.yaml create OVH 'ovh-*' nodepool-ovh.yaml create Vexxhost 'vexxhost-*' nodepool-vexxhost.yaml create OSUOSL 'osuosl-*' nodepool-osuosl.yaml diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml index ed93ae88a2..30c11af8ad 100644 --- a/nodepool/nb04.opendev.org.yaml +++ b/nodepool/nb04.opendev.org.yaml @@ -12,14 +12,6 @@ zookeeper-servers: port: 2281 providers: - - name: linaro-regionone - region-name: 'RegionOne' - cloud: linaro - rate: 0.25 - # 6 hours - image-upload-timeout: 21600 - diskimages: [] - - name: osuosl-regionone region-name: 'RegionOne' cloud: osuosl diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 88dbad70bd..35d0d35dc9 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -366,23 +366,6 @@ providers: diskimage: rockylinux-9 key-name: infra-root-keys-2024-04-08 - - name: linaro-regionone - region-name: 'RegionOne' - # Changing this cloud value impacts things like mirror names in jobs. - # It should be changed carefully. - cloud: linaro - boot-timeout: 600 - launch-timeout: 800 - rate: 0.001 - diskimages: [] - pools: - - name: main - # Network assignment is 147.28.149.96/27, one host is the - # mirror node. - # Set to zero in preparation for cloud shutdown - max-servers: 0 - labels: [] - - name: osuosl-regionone region-name: 'RegionOne' # Changing this cloud value impacts things like mirror names in jobs.