aboutsummaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
Diffstat (limited to 'inventory')
-rw-r--r--inventory/.gitignore1
-rw-r--r--inventory/README.md34
-rw-r--r--inventory/hosts.yaml29
-rw-r--r--inventory/inventory.ini38
4 files changed, 13 insertions, 89 deletions
diff --git a/inventory/.gitignore b/inventory/.gitignore
deleted file mode 100644
index aa29d08..0000000
--- a/inventory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-credentials/
diff --git a/inventory/README.md b/inventory/README.md
deleted file mode 100644
index 294d80b..0000000
--- a/inventory/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Inventory
-The main inventory for the pydis cluster.
-
-## Content
-This directory is not covered by ansible-lint, and should generally not be used to add new configuration.
-Instead, that should be placed appropriately within the project as normal.
-- `hosts.yaml`: The main hosts file for our infrastructure.
-
-## Deployment
-To deploy the kuberspray roles on our infrastructure, run the following commands in the root directory.
-
-### Environment
-Run the following commands, then enter your sudo password in the file that opens:
-
-```shell
-python3.10 -m venv venv
-source venv/bin/activate
-pip install -r kubespray/requirements-2.12.txt
-export ANSIBLE_CONFIG=ansible.cfg
-```
-
-### Deployment
-Enter your username into the command below, and run (this will take a while, so go grab a drink):
-
-```
-ansible-playbook kubespray/cluster.yml -v -u <user>
-```
-
-One useful argument for the command above is `--become-password-file`
-which should point to a file with your sudo password for seamless execution.
-
-Additionally, you may find it helpful to pre-configure all hosts in known_hosts
-to prevent the prompt from timing out during execution. This can be achieved by SSHing
-into the machines beforehand, or running an ad-hoc command and confirming all hosts.
diff --git a/inventory/hosts.yaml b/inventory/hosts.yaml
index c9f597c..a6938c5 100644
--- a/inventory/hosts.yaml
+++ b/inventory/hosts.yaml
@@ -1,25 +1,20 @@
all:
hosts:
turing:
- ansible_host: 89.58.25.151
- ip: 89.58.25.151
- access_ip: 89.58.25.151
- hopper:
- ansible_host: 89.58.24.117
- ip: 89.58.24.117
- access_ip: 89.58.24.117
+ ansible_host: turing.box.pydis.wtf
+ wireguard_subnet: 10.1.0.0/16
lovelace:
- ansible_host: 89.58.26.118
- ip: 89.58.26.118
- access_ip: 89.58.26.118
+ ansible_host: lovelace.box.pydis.wtf
+ wireguard_subnet: 10.2.0.0/16
+ hopper:
+ ansible_host: hopper.box.pydis.wtf
+ wireguard_subnet: 10.3.0.0/16
ritchie:
- ansible_host: 89.58.25.224
- ip: 89.58.25.224
- access_ip: 89.58.25.224
+ ansible_host: ritchie.box.pydis.wtf
+ wireguard_subnet: 10.4.0.0/16
neumann:
- ansible_host: 89.58.12.244
- ip: 89.58.12.244
- access_ip: 89.58.12.244
+ ansible_host: neumann.box.pydis.wtf
+ wireguard_subnet: 10.5.0.0/16
children:
podman:
hosts:
@@ -29,3 +24,5 @@ all:
nginx:
hosts:
turing:
+ vars:
+ wireguard_port: 46850
diff --git a/inventory/inventory.ini b/inventory/inventory.ini
deleted file mode 100644
index 99a6309..0000000
--- a/inventory/inventory.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-# ## Configure 'ip' variable to bind kubernetes services on a
-# ## different ip than the default iface
-# ## We should set etcd_member_name for etcd cluster. The node that is not a etcd member do not need to set the value, or can set the empty string value.
-[all]
-# node1 ansible_host=95.54.0.12 # ip=10.3.0.1 etcd_member_name=etcd1
-# node2 ansible_host=95.54.0.13 # ip=10.3.0.2 etcd_member_name=etcd2
-# node3 ansible_host=95.54.0.14 # ip=10.3.0.3 etcd_member_name=etcd3
-# node4 ansible_host=95.54.0.15 # ip=10.3.0.4 etcd_member_name=etcd4
-# node5 ansible_host=95.54.0.16 # ip=10.3.0.5 etcd_member_name=etcd5
-# node6 ansible_host=95.54.0.17 # ip=10.3.0.6 etcd_member_name=etcd6
-
-# ## configure a bastion host if your nodes are not directly reachable
-# [bastion]
-# bastion ansible_host=x.x.x.x ansible_user=some_user
-
-[kube_control_plane]
-# node1
-# node2
-# node3
-
-[etcd]
-# node1
-# node2
-# node3
-
-[kube_node]
-# node2
-# node3
-# node4
-# node5
-# node6
-
-[calico_rr]
-
-[k8s_cluster:children]
-kube_control_plane
-kube_node
-calico_rr