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:
parent
2f07f34aab
commit
849126d89a
4 changed files with 9 additions and 11 deletions
|
@ -191,6 +191,15 @@ nrpe_procs_warn: 250
|
||||||
num_cpus: 2
|
num_cpus: 2
|
||||||
# ocp4 is only set true in some proxy roles
|
# ocp4 is only set true in some proxy roles
|
||||||
ocp4: false
|
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
|
ocp_wildcard_cert_file: wildcard-2022.apps.ocp.fedoraproject.org.cert
|
||||||
# This is the openshift wildcard cert for ocp
|
# This is the openshift wildcard cert for ocp
|
||||||
ocp_wildcard_cert_name: wildcard-2022.apps.ocp.fedoraproject.org
|
ocp_wildcard_cert_name: wildcard-2022.apps.ocp.fedoraproject.org
|
||||||
|
|
|
@ -47,13 +47,6 @@ ocp_masters:
|
||||||
- ocp01.ocp.iad2.fedoraproject.org
|
- ocp01.ocp.iad2.fedoraproject.org
|
||||||
- ocp02.ocp.iad2.fedoraproject.org
|
- ocp02.ocp.iad2.fedoraproject.org
|
||||||
- ocp03.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:
|
openshift_masters:
|
||||||
- os-master01.vpn.fedoraproject.org
|
- os-master01.vpn.fedoraproject.org
|
||||||
- os-master02.vpn.fedoraproject.org
|
- os-master02.vpn.fedoraproject.org
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
vars:
|
vars:
|
||||||
app: openvpn
|
app: openvpn
|
||||||
ocp_nodes:
|
|
||||||
- worker06.ocp.iad2.fedoraproject.org
|
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- role: openshift/project
|
- role: openshift/project
|
||||||
|
|
|
@ -71,8 +71,6 @@ spec:
|
||||||
path: /dev/net/tun
|
path: /dev/net/tun
|
||||||
- name: openvpn-ssl
|
- name: openvpn-ssl
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: worker06.ocp.iad2.fedoraproject.org
|
|
||||||
affinity:
|
affinity:
|
||||||
podAntiAffinity:
|
podAntiAffinity:
|
||||||
requiredDuringSchedulingIgnoredDuringExecution:
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue