diff --git a/ansible/inventory.yml b/ansible/inventory.yml index ebcd001b4..cc86ac0ee 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -68,14 +68,6 @@ hosts: - marist: zos24-s390x-1: {ip: 148.100.36.157, user: unix1} - - nearform: - macos11.0-arm64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 83.147.191.76 - user: admin - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - - osuosl: aix72-ppc64_be-1: ip: 140.211.9.77 @@ -235,34 +227,6 @@ hosts: SSL_CERT_FILE: "{{ home }}/{{ server_user }}/ca-bundle.crt" server_jobs: 4 - - nearform: - arm-win10_vs2019-arm64-1: {ip: 83.147.191.73} - arm-win10_vs2019-arm64-2: {ip: 83.147.191.74} - macos10.15-x64-1: - ip: 83.147.191.70 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos10.15-x64-2: - ip: 83.147.191.71 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos10.15-x64-3: - ip: 83.147.191.72 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos11.0-arm64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 83.147.191.75 - user: admin - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - intel-ubuntu2204-x64-1: - ip: 92.51.196.114 - build_test_v8: yes - intel-ubuntu2204-x64-2: - ip: 92.51.196.115 - build_test_v8: yes - - osuosl: # secret for -1 was compromised, do not use -1 name aix72-ppc64_be-2: diff --git a/ansible/plugins/inventory/nodejs_yaml.py b/ansible/plugins/inventory/nodejs_yaml.py index fd3984fed..6705a1a8c 100755 --- a/ansible/plugins/inventory/nodejs_yaml.py +++ b/ansible/plugins/inventory/nodejs_yaml.py @@ -48,7 +48,7 @@ # providers - validated for consistency 'provider': ('azure', 'digitalocean', 'equinix', 'ibm', 'iinthecloud', 'joyent', 'linuxonecc', 'hetzner', 'macstadium', 'marist', 'mininodes', 'msft', - 'nearform', 'orka', 'osuosl', 'rackspace', + 'orka', 'osuosl', 'rackspace', 'rzkh', 'scaleway', 'softlayer', 'voxer') } DECRYPT_TOOL = "gpg" diff --git a/tools/host-map/host-map.mjs b/tools/host-map/host-map.mjs index 559c73e8c..b94a777c2 100644 --- a/tools/host-map/host-map.mjs +++ b/tools/host-map/host-map.mjs @@ -37,7 +37,6 @@ if (process.argv.length > 2) { const providerMap = new Map([ ['digitalocean', 'do'], ['iinthecloud', 'iitc'], - ['nearform', 'nf'], ['rackspace', 'rs'], ['softlayer', 'ibm'] ]);