From 1cfe4aca296ff50523a2b21efa4281e757ba3b3a Mon Sep 17 00:00:00 2001 From: zramsay Date: Thu, 11 Jul 2024 14:40:41 -0400 Subject: [PATCH] gotta commit --- group_vars/{rnt_cad => tnt_cad}/k8s-vault.yml | 0 group_vars/{rnt_cad => tnt_cad}/k8s.yml | 4 ++-- .../firewalld.yml | 4 ++-- .../firewalld.yml | 4 ++-- .../{rnt-daemon => tnt-daemon}/firewalld.yml | 4 ++-- host_vars/{rnt-daemon => tnt-daemon}/nginx.yml | 8 ++++---- hosts | 16 ++++++++-------- 7 files changed, 20 insertions(+), 20 deletions(-) rename group_vars/{rnt_cad => tnt_cad}/k8s-vault.yml (100%) rename group_vars/{rnt_cad => tnt_cad}/k8s.yml (94%) rename host_vars/{rnt-cad-cluster-control => tnt-cad-cluster-control}/firewalld.yml (79%) rename host_vars/{rnt-cad-cluster-worker => tnt-cad-cluster-worker}/firewalld.yml (77%) rename host_vars/{rnt-daemon => tnt-daemon}/firewalld.yml (79%) rename host_vars/{rnt-daemon => tnt-daemon}/nginx.yml (77%) diff --git a/group_vars/rnt_cad/k8s-vault.yml b/group_vars/tnt_cad/k8s-vault.yml similarity index 100% rename from group_vars/rnt_cad/k8s-vault.yml rename to group_vars/tnt_cad/k8s-vault.yml diff --git a/group_vars/rnt_cad/k8s.yml b/group_vars/tnt_cad/k8s.yml similarity index 94% rename from group_vars/rnt_cad/k8s.yml rename to group_vars/tnt_cad/k8s.yml index d78f43f..ee10645 100644 --- a/group_vars/rnt_cad/k8s.yml +++ b/group_vars/tnt_cad/k8s.yml @@ -1,8 +1,8 @@ --- # default context is used for stack orchestrator deployments, for testing a custom context name can be usefull -#k8s_cluster_name: rnt-cad-cluster +#k8s_cluster_name: tnt-cad-cluster k8s_cluster_name: default -k8s_cluster_url: rnt-cad-cluster-control.realitynetwork.store +k8s_cluster_url: tnt-cad-cluster-control.realitynetwork.store k8s_taint_servers: true k8s_acme_email: "{{ support_email }}" diff --git a/host_vars/rnt-cad-cluster-control/firewalld.yml b/host_vars/tnt-cad-cluster-control/firewalld.yml similarity index 79% rename from host_vars/rnt-cad-cluster-control/firewalld.yml rename to host_vars/tnt-cad-cluster-control/firewalld.yml index 0ae25d2..1c01945 100644 --- a/host_vars/rnt-cad-cluster-control/firewalld.yml +++ b/host_vars/tnt-cad-cluster-control/firewalld.yml @@ -13,5 +13,5 @@ firewalld_add: sources: - 10.42.0.0/16 - 10.43.0.0/16 - - 142.93.110.163/32 - - 147.182.158.116/32 + - 165.227.34.121/32 + - 167.99.181.37/32 diff --git a/host_vars/rnt-cad-cluster-worker/firewalld.yml b/host_vars/tnt-cad-cluster-worker/firewalld.yml similarity index 77% rename from host_vars/rnt-cad-cluster-worker/firewalld.yml rename to host_vars/tnt-cad-cluster-worker/firewalld.yml index fc1d2d8..09c4d99 100644 --- a/host_vars/rnt-cad-cluster-worker/firewalld.yml +++ b/host_vars/tnt-cad-cluster-worker/firewalld.yml @@ -11,5 +11,5 @@ firewalld_add: sources: - 10.42.0.0/16 - 10.43.0.0/16 - - 142.93.110.163/32 - - 147.182.150.60/32 + - 165.227.34.121/32 + - 167.99.182.224/32 diff --git a/host_vars/rnt-daemon/firewalld.yml b/host_vars/tnt-daemon/firewalld.yml similarity index 79% rename from host_vars/rnt-daemon/firewalld.yml rename to host_vars/tnt-daemon/firewalld.yml index d5fc36f..44787f9 100644 --- a/host_vars/rnt-daemon/firewalld.yml +++ b/host_vars/tnt-daemon/firewalld.yml @@ -13,5 +13,5 @@ firewalld_add: - name: trusted sources: - - 147.182.150.60/32 - - 147.182.158.116/32 + - 167.99.182.224/32 + - 167.99.181.37/32 diff --git a/host_vars/rnt-daemon/nginx.yml b/host_vars/tnt-daemon/nginx.yml similarity index 77% rename from host_vars/rnt-daemon/nginx.yml rename to host_vars/tnt-daemon/nginx.yml index 42dd959..4d066a7 100644 --- a/host_vars/rnt-daemon/nginx.yml +++ b/host_vars/tnt-daemon/nginx.yml @@ -6,14 +6,14 @@ nginx_proxy_send_timeout: 1200 nginx_proxy_connection_timeout: 75 nginx_sites: - - name: rnt-console - url: rnt-console.realitynetwork.store + - name: tnt-console + url: tnt-console.realitynetwork.store upstream: http://localhost:8080 template: basic-proxy ssl: true - - name: rnt-daemon - url: rnt-daemon.realitynetwork.store + - name: tnt-daemon + url: tnt-daemon.realitynetwork.store upstream: http://localhost:9473 configs: - rewrite ^/deployer(/.*)? https://webapp-deployer.pwa.realitynetwork.store permanent diff --git a/hosts b/hosts index 0bba790..cb604c1 100644 --- a/hosts +++ b/hosts @@ -1,14 +1,14 @@ [all] -rnt-daemon ansible_host=142.93.110.163 -rnt-cad-cluster-control ansible_host=147.182.150.60 -rnt-cad-cluster-worker ansible_host=147.182.158.116 +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] -rnt-daemon +tnt-daemon -[rnt_cad] -rnt-cad-cluster-control k8s_node_type=bootstrap -rnt-cad-cluster-worker k8s_node_type=agent k8s_pod_limit=1024 k8s_external_ip=147.182.158.116 +[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 [k8s:children] -rnt_cad +tnt_cad