flatten inventories making them simpler
All checks were successful
/ Ansible Lint (push) Successful in 1m41s

Remove the child groups as we weren't using their functionality anyway.
Also remove the debian_11/12 host groups as they're not in use.
This commit is contained in:
June 2025-02-16 00:36:10 +01:00
commit 61cd5053d0
Signed by: june
SSH key fingerprint: SHA256:o9EAq4Y9N9K0pBQeBTqhSDrND5E7oB+60ZNx0U1yPe0
2 changed files with 177 additions and 183 deletions

View file

@ -1,160 +1,158 @@
all: all:
children: hosts:
debian_12: ccchoir:
hosts: ansible_host: ccchoir-intern.hamburg.ccc.de
ccchoir: ansible_user: chaos
ansible_host: ccchoir-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos cloud:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: cloud-intern.hamburg.ccc.de
cloud: ansible_user: chaos
ansible_host: cloud-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos eh22-wiki:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: eh22-wiki-intern.hamburg.ccc.de
eh22-wiki: ansible_user: chaos
ansible_host: eh22-wiki-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos grafana:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: grafana-intern.hamburg.ccc.de
grafana: ansible_user: chaos
ansible_host: grafana-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos tickets:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: tickets-intern.hamburg.ccc.de
tickets: ansible_user: chaos
ansible_host: tickets-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos keycloak:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: keycloak-intern.hamburg.ccc.de
keycloak: ansible_user: chaos
ansible_host: keycloak-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos lists:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: lists.hamburg.ccc.de
lists: ansible_user: chaos
ansible_host: lists.hamburg.ccc.de mumble:
ansible_user: chaos ansible_host: mumble.hamburg.ccc.de
mumble: ansible_user: chaos
ansible_host: mumble.hamburg.ccc.de netbox:
ansible_user: chaos ansible_host: netbox-intern.hamburg.ccc.de
netbox: ansible_user: chaos
ansible_host: netbox-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos onlyoffice:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: onlyoffice-intern.hamburg.ccc.de
onlyoffice: ansible_user: chaos
ansible_host: onlyoffice-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos pad:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: pad-intern.hamburg.ccc.de
pad: ansible_user: chaos
ansible_host: pad-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos pretalx:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: pretalx-intern.hamburg.ccc.de
pretalx: ansible_user: chaos
ansible_host: pretalx-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos public-reverse-proxy:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: public-reverse-proxy.hamburg.ccc.de
public-reverse-proxy: ansible_user: chaos
ansible_host: public-reverse-proxy.hamburg.ccc.de wiki:
ansible_user: chaos ansible_host: wiki-intern.hamburg.ccc.de
wiki: ansible_user: chaos
ansible_host: wiki-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos zammad:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de ansible_host: zammad-intern.hamburg.ccc.de
zammad: ansible_user: chaos
ansible_host: zammad-intern.hamburg.ccc.de ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de
ansible_user: chaos base_config_hosts:
ansible_ssh_common_args: -J ssh://chaos@public-reverse-proxy.hamburg.ccc.de hosts:
base_config_hosts: ccchoir:
hosts: cloud:
ccchoir: eh22-wiki:
cloud: grafana:
eh22-wiki: keycloak:
grafana: lists:
keycloak: mumble:
lists: netbox:
mumble: onlyoffice:
netbox: pad:
onlyoffice: pretalx:
pad: public-reverse-proxy:
pretalx: tickets:
public-reverse-proxy: wiki:
tickets: zammad:
wiki: docker_compose_hosts:
zammad: hosts:
docker_compose_hosts: ccchoir:
hosts: grafana:
ccchoir: tickets:
grafana: keycloak:
tickets: lists:
keycloak: onlyoffice:
lists: pad:
onlyoffice: pretalx:
pad: zammad:
pretalx: nextcloud_hosts:
zammad: hosts:
nextcloud_hosts: cloud:
hosts: nginx_hosts:
cloud: hosts:
nginx_hosts: ccchoir:
hosts: eh22-wiki:
ccchoir: grafana:
eh22-wiki: tickets:
grafana: keycloak:
tickets: lists:
keycloak: mumble:
lists: netbox:
mumble: onlyoffice:
netbox: pad:
onlyoffice: pretalx:
pad: public-reverse-proxy:
pretalx: wiki:
public-reverse-proxy: zammad:
wiki: public_reverse_proxy_hosts:
zammad: hosts:
public_reverse_proxy_hosts: public-reverse-proxy:
hosts: certbot_hosts:
public-reverse-proxy: hosts:
certbot_hosts: ccchoir:
hosts: eh22-wiki:
ccchoir: grafana:
eh22-wiki: tickets:
grafana: keycloak:
tickets: lists:
keycloak: mumble:
lists: netbox:
mumble: onlyoffice:
netbox: pad:
onlyoffice: pretalx:
pad: wiki:
pretalx: zammad:
wiki: prometheus_node_exporter_hosts:
zammad: hosts:
prometheus_node_exporter_hosts: ccchoir:
hosts: eh22-wiki:
ccchoir: tickets:
eh22-wiki: keycloak:
tickets: netbox:
keycloak: onlyoffice:
netbox: pad:
onlyoffice: pretalx:
pad: wiki:
pretalx: zammad:
wiki: infrastructure_authorized_keys_hosts:
zammad: hosts:
infrastructure_authorized_keys_hosts: ccchoir:
hosts: eh22-wiki:
ccchoir: grafana:
eh22-wiki: tickets:
grafana: cloud:
tickets: keycloak:
cloud: netbox:
keycloak: onlyoffice:
netbox: pad:
onlyoffice: pretalx:
pad: public-reverse-proxy:
pretalx: wiki:
public-reverse-proxy: zammad:
wiki: wiki_hosts:
zammad: hosts:
wiki_hosts: eh22-wiki:
hosts: wiki:
eh22-wiki: netbox_hosts:
wiki: hosts:
netbox_hosts: netbox:
hosts:
netbox:

View file

@ -1,25 +1,21 @@
all: all:
children: hosts:
debian_11: light:
hosts: ansible_host: light.z9.ccchh.net
light: ansible_user: chaos
ansible_host: light.z9.ccchh.net authoritative-dns:
ansible_user: chaos ansible_host: authoritative-dns.z9.ccchh.net
authoritative-dns: ansible_user: chaos
ansible_host: authoritative-dns.z9.ccchh.net nginx_hosts:
ansible_user: chaos hosts:
debian_12: light:
hosts: ola_hosts:
nginx_hosts: hosts:
hosts: light:
light: foobazdmx_hosts:
ola_hosts: hosts:
hosts: light:
light: infrastructure_authorized_keys_hosts:
foobazdmx_hosts: hosts:
hosts: light:
light: authoritative-dns:
infrastructure_authorized_keys_hosts:
hosts:
light:
authoritative-dns: