Browse Source

Merge "Update nodepool servers to puppet 4"

changes/80/650380/2
Zuul 1 month ago
parent
commit
6747cf236b

+ 2
- 2
inventory/groups.yaml View File

@@ -39,8 +39,6 @@ groups:
39 39
     - git.openstack.org
40 40
     - git[0-9]*.openstack.org
41 41
     - lists*.open*.org
42
-    - nb[0-9]*.open*.org
43
-    - nl[0-9]*.open*.org
44 42
     - ze[0-9]*.open*.org
45 43
     - zk[0-9]*.open*.org
46 44
     - zm[0-9]*.open*.org
@@ -176,6 +174,8 @@ groups:
176 174
     - logstash[0-9]*.open*.org
177 175
     - mirror-update[0-9]*.open*.org
178 176
     - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|arm64ci).*\.open.*\.org
177
+    - ^nb(?!03)[0-9]*\.open.*\.org
178
+    - nl[0-9]*.open*.org
179 179
     - openstackid[0-9]*.openstack.org
180 180
     - openstackid-dev[0-9]*.openstack.org
181 181
     - paste[0-9]*.open*.org

+ 1
- 1
playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml View File

@@ -63,8 +63,8 @@ results:
63 63
     - nodepool
64 64
     - nodepool-builder
65 65
     - puppet
66
+    - puppet4
66 67
     - webservers
67
-    - futureparser
68 68
 
69 69
   ze01.openstack.org:
70 70
     - afs-client

Loading…
Cancel
Save