openvpn: move ocp_nodes var to all, drop node-selector from testing

Putting ocp_nodes in group_vars/all allows both proxies and openvpn
openshift app to use it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2022-06-09 13:51:56 -07:00
parent 2f07f34aab
commit 849126d89a
4 changed files with 9 additions and 11 deletions

View file

@ -191,6 +191,15 @@ nrpe_procs_warn: 250
num_cpus: 2
# ocp4 is only set true in some proxy roles
ocp4: false
# All the ocp production nodes. We place this here so proxies and openvpn openshift app
# can both use it.
ocp_nodes:
- worker01.ocp.iad2.fedoraproject.org
- worker02.ocp.iad2.fedoraproject.org
- worker03.ocp.iad2.fedoraproject.org
- worker04.ocp.iad2.fedoraproject.org
- worker05.ocp.iad2.fedoraproject.org
- worker06.ocp.iad2.fedoraproject.org
ocp_wildcard_cert_file: wildcard-2022.apps.ocp.fedoraproject.org.cert
# This is the openshift wildcard cert for ocp
ocp_wildcard_cert_name: wildcard-2022.apps.ocp.fedoraproject.org

View file

@ -47,13 +47,6 @@ ocp_masters:
- ocp01.ocp.iad2.fedoraproject.org
- ocp02.ocp.iad2.fedoraproject.org
- ocp03.ocp.iad2.fedoraproject.org
ocp_nodes:
- worker01.ocp.iad2.fedoraproject.org
- worker02.ocp.iad2.fedoraproject.org
- worker03.ocp.iad2.fedoraproject.org
- worker04.ocp.iad2.fedoraproject.org
- worker05.ocp.iad2.fedoraproject.org
- worker06.ocp.iad2.fedoraproject.org
openshift_masters:
- os-master01.vpn.fedoraproject.org
- os-master02.vpn.fedoraproject.org

View file

@ -10,8 +10,6 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
vars:
app: openvpn
ocp_nodes:
- worker06.ocp.iad2.fedoraproject.org
roles:
- role: openshift/project

View file

@ -71,8 +71,6 @@ spec:
path: /dev/net/tun
- name: openvpn-ssl
emptyDir: {}
nodeSelector:
kubernetes.io/hostname: worker06.ocp.iad2.fedoraproject.org
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution: