diff --git a/group_vars/tnt_cad/k8s.yml b/group_vars/tnt_cad/k8s.yml index ee10645..baec202 100644 --- a/group_vars/tnt_cad/k8s.yml +++ b/group_vars/tnt_cad/k8s.yml @@ -3,7 +3,7 @@ #k8s_cluster_name: tnt-cad-cluster k8s_cluster_name: default k8s_cluster_url: tnt-cad-cluster-control.realitynetwork.store -k8s_taint_servers: true +k8s_taint_servers: false k8s_acme_email: "{{ support_email }}" diff --git a/host_vars/tnt-cad-cluster-control/firewalld.yml b/host_vars/tnt-cad-cluster-control/firewalld.yml index 1c01945..fc6d2db 100644 --- a/host_vars/tnt-cad-cluster-control/firewalld.yml +++ b/host_vars/tnt-cad-cluster-control/firewalld.yml @@ -14,4 +14,3 @@ firewalld_add: - 10.42.0.0/16 - 10.43.0.0/16 - 165.227.34.121/32 - - 167.99.181.37/32 diff --git a/host_vars/tnt-cad-cluster-worker/firewalld.yml b/host_vars/tnt-cad-cluster-worker/firewalld.yml deleted file mode 100644 index 09c4d99..0000000 --- a/host_vars/tnt-cad-cluster-worker/firewalld.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -firewalld_add: - - name: public - interfaces: - - enp9s0 - services: - - http - - https - - - name: trusted - sources: - - 10.42.0.0/16 - - 10.43.0.0/16 - - 165.227.34.121/32 - - 167.99.182.224/32 diff --git a/host_vars/tnt-daemon/firewalld.yml b/host_vars/tnt-daemon/firewalld.yml index a21f50f..9dc4d67 100644 --- a/host_vars/tnt-daemon/firewalld.yml +++ b/host_vars/tnt-daemon/firewalld.yml @@ -14,4 +14,3 @@ firewalld_add: - name: trusted sources: - 167.99.182.224/32 - - 167.99.181.37/32 diff --git a/hosts b/hosts index cb604c1..79e79dc 100644 --- a/hosts +++ b/hosts @@ -1,14 +1,12 @@ [all] tnt-daemon ansible_host=165.227.34.121 tnt-cad-cluster-control ansible_host=167.99.182.224 -tnt-cad-cluster-worker ansible_host=167.99.181.37 [so] tnt-daemon [tnt_cad] -tnt-cad-cluster-control k8s_node_type=bootstrap -tnt-cad-cluster-worker k8s_node_type=agent k8s_pod_limit=1024 k8s_external_ip=167.99.181.37 +tnt-cad-cluster-control k8s_node_type=bootstrap k8s_pod_limit=1024 k8s_external_ip=167.99.182.224 [k8s:children] tnt_cad