diff options
author | Christian Pointner <equinox@spreadspace.org> | 2019-05-25 01:42:52 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2019-05-25 01:42:52 +0200 |
commit | f3644fd2b364b86afcecc011e36e3efda2f00624 (patch) | |
tree | a05619dd769840c8dc1215683f63ff2403127ee4 | |
parent | mz-router: added dyndns (diff) | |
parent | fix python interpreter config (diff) |
Merge branch 'ansible-2.8'
-rw-r--r-- | ansible.cfg | 2 | ||||
-rw-r--r-- | chaos-at-home/k8s-test.yml | 6 | ||||
-rw-r--r-- | dan/ele-ap.yml | 2 | ||||
-rw-r--r-- | dan/ele-dolmetsch-ctl.yml | 2 | ||||
-rw-r--r-- | dan/ele-dolmetsch-raspi.yml | 2 | ||||
-rw-r--r-- | dan/group_vars/elevate_festival.yml (renamed from dan/group_vars/elevate-festival.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/chaos_at_home/main.yml (renamed from inventory/group_vars/chaos-at-home/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/dolmetsch_ctl/main.yml (renamed from inventory/group_vars/dolmetsch-ctl/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/ele_ap/main.yml (renamed from inventory/group_vars/ele-ap/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/ele_dolmetsch_ctl/main.yml (renamed from inventory/group_vars/ele-dolmetsch-ctl/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/ele_infobeamer/main.yml (renamed from inventory/group_vars/ele-infobeamer/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/elevate_festival/main.yml (renamed from inventory/group_vars/elevate-festival/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/emc_xx/main.yml (renamed from inventory/group_vars/emc-xx/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/k8s_emc/main.yml (renamed from inventory/group_vars/k8s-emc/main.yml) | 0 | ||||
-rw-r--r-- | inventory/group_vars/k8s_test/main.yml (renamed from inventory/group_vars/k8s-test/main.yml) | 0 | ||||
-rw-r--r-- | inventory/hosts.ini | 96 | ||||
-rw-r--r-- | roles/prepare-dkms/tasks/main.yml | 4 | ||||
-rw-r--r-- | spreadspace/acme-emc.yml | 2 | ||||
-rw-r--r-- | spreadspace/emc-dist.yml | 2 | ||||
-rw-r--r-- | spreadspace/emc-xx.yml | 2 | ||||
-rw-r--r-- | spreadspace/k8s-emc.yml | 6 |
21 files changed, 64 insertions, 62 deletions
diff --git a/ansible.cfg b/ansible.cfg index 4248b8ba..001e7cbe 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -22,6 +22,8 @@ var_compression_level = 9 bin_ansible_callbacks = True +interpreter_python = auto + [ssh_connection] pipelining = True ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s diff --git a/chaos-at-home/k8s-test.yml b/chaos-at-home/k8s-test.yml index 758e0ece..e0a6c2c4 100644 --- a/chaos-at-home/k8s-test.yml +++ b/chaos-at-home/k8s-test.yml @@ -1,16 +1,16 @@ --- - name: prepare hetzner hosts - hosts: k8s-test:&hetzner + hosts: k8s_test:&hetzner roles: - role: slim/hetzner - name: prepare hetzner hosts - hosts: k8s-test:&scaleway + hosts: k8s_test:&scaleway roles: - role: slim/scaleway - name: Basic Setup - hosts: k8s-test + hosts: k8s_test roles: - role: base - role: sshd diff --git a/dan/ele-ap.yml b/dan/ele-ap.yml index a64ed8a4..4eebf849 100644 --- a/dan/ele-ap.yml +++ b/dan/ele-ap.yml @@ -1,5 +1,5 @@ --- -- hosts: ele-ap +- hosts: ele_ap connection: local roles: - role: openwrt/image diff --git a/dan/ele-dolmetsch-ctl.yml b/dan/ele-dolmetsch-ctl.yml index d16cfbdb..48e0a101 100644 --- a/dan/ele-dolmetsch-ctl.yml +++ b/dan/ele-dolmetsch-ctl.yml @@ -1,5 +1,5 @@ --- -- hosts: ele-dolmetsch-ctl +- hosts: ele_dolmetsch_ctl connection: local roles: - role: openwrt/image diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml index 5b1068e0..386dbebc 100644 --- a/dan/ele-dolmetsch-raspi.yml +++ b/dan/ele-dolmetsch-raspi.yml @@ -1,5 +1,5 @@ --- -- hosts: ele-dolmetsch-raspi +- hosts: ele_dolmetsch_raspi roles: - role: slim/raspbian - role: base diff --git a/dan/group_vars/elevate-festival.yml b/dan/group_vars/elevate_festival.yml index 15ceffe4..15ceffe4 100644 --- a/dan/group_vars/elevate-festival.yml +++ b/dan/group_vars/elevate_festival.yml diff --git a/inventory/group_vars/chaos-at-home/main.yml b/inventory/group_vars/chaos_at_home/main.yml index 1d44eb7d..1d44eb7d 100644 --- a/inventory/group_vars/chaos-at-home/main.yml +++ b/inventory/group_vars/chaos_at_home/main.yml diff --git a/inventory/group_vars/dolmetsch-ctl/main.yml b/inventory/group_vars/dolmetsch_ctl/main.yml index d1ffc8ae..d1ffc8ae 100644 --- a/inventory/group_vars/dolmetsch-ctl/main.yml +++ b/inventory/group_vars/dolmetsch_ctl/main.yml diff --git a/inventory/group_vars/ele-ap/main.yml b/inventory/group_vars/ele_ap/main.yml index e74539e3..e74539e3 100644 --- a/inventory/group_vars/ele-ap/main.yml +++ b/inventory/group_vars/ele_ap/main.yml diff --git a/inventory/group_vars/ele-dolmetsch-ctl/main.yml b/inventory/group_vars/ele_dolmetsch_ctl/main.yml index a69d45ee..a69d45ee 100644 --- a/inventory/group_vars/ele-dolmetsch-ctl/main.yml +++ b/inventory/group_vars/ele_dolmetsch_ctl/main.yml diff --git a/inventory/group_vars/ele-infobeamer/main.yml b/inventory/group_vars/ele_infobeamer/main.yml index 4e513286..4e513286 100644 --- a/inventory/group_vars/ele-infobeamer/main.yml +++ b/inventory/group_vars/ele_infobeamer/main.yml diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate_festival/main.yml index 5a513cfe..5a513cfe 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate_festival/main.yml diff --git a/inventory/group_vars/emc-xx/main.yml b/inventory/group_vars/emc_xx/main.yml index e4fc5e0d..e4fc5e0d 100644 --- a/inventory/group_vars/emc-xx/main.yml +++ b/inventory/group_vars/emc_xx/main.yml diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s_emc/main.yml index 18c28177..18c28177 100644 --- a/inventory/group_vars/k8s-emc/main.yml +++ b/inventory/group_vars/k8s_emc/main.yml diff --git a/inventory/group_vars/k8s-test/main.yml b/inventory/group_vars/k8s_test/main.yml index 7e5cbe2e..7e5cbe2e 100644 --- a/inventory/group_vars/k8s-test/main.yml +++ b/inventory/group_vars/k8s_test/main.yml diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 89e5385c..e602f606 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -8,34 +8,34 @@ ansible_port=22000 ############################### # environment: chaos-at-home -[chaos-at-home:vars] +[chaos_at_home:vars] host_domain=chaos-at-home.org env_group=chaos-at-home ansible_host={{ host_name }}.{{ host_domain }} -[chaos-at-home] +[chaos_at_home] #prometheus atlas keyserver pan ansible_host=ch-pan ansible_port=222 mimas2 ansible_host=ch-mimas2 ansible_port=222 -[chaos-at-home:children] -mz-chaos-at-home +[chaos_at_home:children] +mz_chaos_at_home -[mz-chaos-at-home:vars] +[mz_chaos_at_home:vars] ansible_port=222 -[mz-chaos-at-home] +[mz_chaos_at_home] mz-router ansible_host=chmz-router mz-ap ansible_host=chmz-ap -[k8s-test:vars] +[k8s_test:vars] env_group=chaos-at-home -[k8s-test] +[k8s_test] k8s-test0 k8s-test1 k8s-test2 @@ -67,13 +67,13 @@ emc-stats emc-master [emc:children] -emc-dist -emc-xx +emc_dist +emc_xx -[emc-dist] +[emc_dist] #emc-dist0 -[emc-xx] +[emc_xx] #emc-0[0:6] emc-00 @@ -92,21 +92,21 @@ sk2016 host_name=2016 ansible_port=22000 sk-cloudia host_name=cloudia -[ele-ap] +[ele_ap] ele-ap-forum[0:3] #ele-ap-dom0 ele-ap-kunsthaus0 ele-ap-orpheum0 -[ele-dolmetsch-ctl] +[ele_dolmetsch_ctl] ele-dol-mixer ele-dol-translator -[ele-dolmetsch-raspi] +[ele_dolmetsch_raspi] ele-dol-raspi0 ele-dol-raspi1 -[ele-infobeamer] +[ele_infobeamer] ele-infobeamer-emc ele-infobeamer-orpheum ele-infobeamer-default @@ -123,10 +123,10 @@ ele-thetys host_name=thetys ele-uhrturm host_name=uhrturm [elevate:children] -ele-ap -ele-dolmetsch-ctl -ele-dolmetsch-raspi -ele-infobeamer +ele_ap +ele_dolmetsch_ctl +ele_dolmetsch_raspi +ele_infobeamer ############################### @@ -154,68 +154,68 @@ k8s-test0 k8s-test2 [hetzner:children] -emc-xx +emc_xx hroot hcloud -[scaleway-kernel] +[scaleway_kernel] [scaleway] k8s-test1 [scaleway:children] -scaleway-kernel +scaleway_kernel [accesspoints:children] -ele-ap +ele_ap -[dolmetsch-ctl:children] -ele-dolmetsch-ctl +[dolmetsch_ctl:children] +ele_dolmetsch_ctl -[dolmetsch-raspi:children] -ele-dolmetsch-raspi +[dolmetsch_raspi:children] +ele_dolmetsch_raspi ### kubernetes cluster: emc -[k8s-emc-encoder] +[k8s_emc_encoder] #dione #helene -[k8s-emc-distribution:children] -emc-dist +[k8s_emc_distribution:children] +emc_dist -[k8s-emc-streamer:children] -emc-xx +[k8s_emc_streamer:children] +emc_xx -[k8s-emc-master] +[k8s_emc_master] emc-master -[k8s-emc-stats] +[k8s_emc_stats] emc-stats -[k8s-emc:children] -k8s-emc-master -k8s-emc-encoder -k8s-emc-distribution -k8s-emc-streamer -k8s-emc-stats +[k8s_emc:children] +k8s_emc_master +k8s_emc_encoder +k8s_emc_distribution +k8s_emc_streamer +k8s_emc_stats ### Elevate Festival -[elevate-festival:children] +[elevate_festival:children] elevate -k8s-emc +k8s_emc ### kubernetes cluster: chaos -[k8s-chaos-master] +[k8s_chaos_master] k8s-test0 -[k8s-chaos-nodes] +[k8s_chaos_nodes] k8s-test[1:2] -[k8s-chaos:children] -k8s-chaos-master -k8s-chaos-nodes +[k8s_chaos:children] +k8s_chaos_master +k8s_chaos_nodes diff --git a/roles/prepare-dkms/tasks/main.yml b/roles/prepare-dkms/tasks/main.yml index 94f47c31..7f55ba6d 100644 --- a/roles/prepare-dkms/tasks/main.yml +++ b/roles/prepare-dkms/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: prepare dkms on scaleway boxes include_tasks: scaleway.yml - when: "'scaleway-kernel' in group_names" + when: "'scaleway_kernel' in group_names" - name: prepare dkms on for raspberry-pi include_tasks: raspberrypi.yml @@ -9,4 +9,4 @@ - name: prepare dkms on normal debian boxes include_tasks: default.yml - when: "'scaleway-kernel' not in group_names and ansible_lsb.id != 'Raspbian'" + when: "'scaleway_kernel' not in group_names and ansible_lsb.id != 'Raspbian'" diff --git a/spreadspace/acme-emc.yml b/spreadspace/acme-emc.yml index 41fff42b..d0210e1d 100644 --- a/spreadspace/acme-emc.yml +++ b/spreadspace/acme-emc.yml @@ -1,6 +1,6 @@ --- - name: create certificates for host - hosts: emc-xx:helene + hosts: emc_xx:helene vars: acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" roles: diff --git a/spreadspace/emc-dist.yml b/spreadspace/emc-dist.yml index d9796969..fce5f7e2 100644 --- a/spreadspace/emc-dist.yml +++ b/spreadspace/emc-dist.yml @@ -1,6 +1,6 @@ --- - name: Basic Setup - hosts: emc-dist + hosts: emc_dist roles: - role: slim/hetzner - role: base diff --git a/spreadspace/emc-xx.yml b/spreadspace/emc-xx.yml index c73ffd0c..4627107e 100644 --- a/spreadspace/emc-xx.yml +++ b/spreadspace/emc-xx.yml @@ -1,6 +1,6 @@ --- - name: Basic Setup - hosts: emc-xx:!emc-00 + hosts: emc_xx:!emc-00 roles: - role: slim/hetzner - role: base diff --git a/spreadspace/k8s-emc.yml b/spreadspace/k8s-emc.yml index cd4e8e2e..0eada061 100644 --- a/spreadspace/k8s-emc.yml +++ b/spreadspace/k8s-emc.yml @@ -1,11 +1,11 @@ --- - name: setup cluster config - hosts: k8s-emc + hosts: k8s_emc gather_facts: no run_once: yes tasks: - name: create group for all kubernetes nodes - with_items: "{{ groups['k8s-emc'] }}" + with_items: "{{ groups['k8s_emc'] }}" add_host: name: "{{ item }}" inventory_dir: "{{ inventory_dir }}" @@ -13,7 +13,7 @@ changed_when: False - name: create group for kubernetes master nodes - with_items: "{{ groups['k8s-emc-master'] }}" + with_items: "{{ groups['k8s_emc_master'] }}" add_host: name: "{{ item }}" inventory_dir: "{{ inventory_dir }}" |