From 3270b5cc3ee02009819853c834fa0b3ab38de0d4 Mon Sep 17 00:00:00 2001 From: Tobias Hachmer Date: Tue, 5 Sep 2017 11:25:13 +0200 Subject: [PATCH] Inventory: clean up & rename role ffmwu-prereq to test-prerequisites Remove all hosts which aren't set up by ansible, yet. Prepare to start from scratch. Only add hosts to the inventory which will be set up completly by ansible. --- inventory/group_vars/gates | 3 -- inventory/group_vars/meshing-only-srv | 3 -- inventory/group_vars/meshing-srv | 19 ---------- inventory/host_vars/aubergine.freifunk-mwu.de | 4 -- inventory/host_vars/churro.freifunk-mwu.de | 4 -- .../host_vars/extrasahne.freifunk-mwu.de | 6 --- .../host_vars/glueckskeks.freifunk-mwu.de | 4 -- inventory/host_vars/ingwer.freifunk-mwu.de | 4 -- inventory/host_vars/linse.freifunk-mwu.de | 3 -- .../host_vars/lotuswurzel.freifunk-mwu.de | 4 -- inventory/host_vars/milchreis.freifunk-mwu.de | 7 ---- inventory/host_vars/spinat.freifunk-mwu.de | 4 -- .../host_vars/suesskartoffel.freifunk-mwu.de | 7 ---- .../host_vars/wasserfloh.freifunk-mwu.de | 4 -- .../host_vars/zuckerwatte.freifunk-mwu.de | 12 ------ inventory/host_vars/zwiebel.freifunk-mwu.de | 4 -- inventory/hosts | 37 +++---------------- playbook-build-server.yml | 3 +- playbook-test-prereqs.yml | 5 +-- .../tasks/main.yml | 0 20 files changed, 8 insertions(+), 129 deletions(-) delete mode 100644 inventory/group_vars/gates delete mode 100644 inventory/group_vars/meshing-only-srv delete mode 100644 inventory/group_vars/meshing-srv delete mode 100644 inventory/host_vars/aubergine.freifunk-mwu.de delete mode 100644 inventory/host_vars/churro.freifunk-mwu.de delete mode 100644 inventory/host_vars/extrasahne.freifunk-mwu.de delete mode 100644 inventory/host_vars/glueckskeks.freifunk-mwu.de delete mode 100644 inventory/host_vars/ingwer.freifunk-mwu.de delete mode 100644 inventory/host_vars/linse.freifunk-mwu.de delete mode 100644 inventory/host_vars/lotuswurzel.freifunk-mwu.de delete mode 100644 inventory/host_vars/milchreis.freifunk-mwu.de delete mode 100644 inventory/host_vars/spinat.freifunk-mwu.de delete mode 100644 inventory/host_vars/suesskartoffel.freifunk-mwu.de delete mode 100644 inventory/host_vars/wasserfloh.freifunk-mwu.de delete mode 100644 inventory/host_vars/zuckerwatte.freifunk-mwu.de delete mode 100644 inventory/host_vars/zwiebel.freifunk-mwu.de rename roles/{ffmwu-prereqs => test-prerequisites}/tasks/main.yml (100%) diff --git a/inventory/group_vars/gates b/inventory/group_vars/gates deleted file mode 100644 index a074597..0000000 --- a/inventory/group_vars/gates +++ /dev/null @@ -1,3 +0,0 @@ ---- - -fastd_config: 'gate' diff --git a/inventory/group_vars/meshing-only-srv b/inventory/group_vars/meshing-only-srv deleted file mode 100644 index a1d400f..0000000 --- a/inventory/group_vars/meshing-only-srv +++ /dev/null @@ -1,3 +0,0 @@ ---- - -fastd_config: 'meshing-only' diff --git a/inventory/group_vars/meshing-srv b/inventory/group_vars/meshing-srv deleted file mode 100644 index 922f42c..0000000 --- a/inventory/group_vars/meshing-srv +++ /dev/null @@ -1,19 +0,0 @@ ---- - -communities: - - mz - - wi - -community_params: - mz: - fastd_port: 10037 - abbreviation: mz - name: mainz - repo: freifunk-mwu/peers-ffmz - xtra_peers: - - peers_bingen - wi: - fastd_port: 10056 - abbreviation: wi - name: wiesbaden - repo: freifunk-mwu/peers-ffwi diff --git a/inventory/host_vars/aubergine.freifunk-mwu.de b/inventory/host_vars/aubergine.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/aubergine.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/churro.freifunk-mwu.de b/inventory/host_vars/churro.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/churro.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/extrasahne.freifunk-mwu.de b/inventory/host_vars/extrasahne.freifunk-mwu.de deleted file mode 100644 index ff09e51..0000000 --- a/inventory/host_vars/extrasahne.freifunk-mwu.de +++ /dev/null @@ -1,6 +0,0 @@ ---- - -ansible_managed_server: True -ansible_managed_meshing: True - -fastd_alias: gw_extrasahne diff --git a/inventory/host_vars/glueckskeks.freifunk-mwu.de b/inventory/host_vars/glueckskeks.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/glueckskeks.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/ingwer.freifunk-mwu.de b/inventory/host_vars/ingwer.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/ingwer.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/linse.freifunk-mwu.de b/inventory/host_vars/linse.freifunk-mwu.de deleted file mode 100644 index 5b67d99..0000000 --- a/inventory/host_vars/linse.freifunk-mwu.de +++ /dev/null @@ -1,3 +0,0 @@ ---- - -ansible_managed_server: True diff --git a/inventory/host_vars/lotuswurzel.freifunk-mwu.de b/inventory/host_vars/lotuswurzel.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/lotuswurzel.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/milchreis.freifunk-mwu.de b/inventory/host_vars/milchreis.freifunk-mwu.de deleted file mode 100644 index a6193da..0000000 --- a/inventory/host_vars/milchreis.freifunk-mwu.de +++ /dev/null @@ -1,7 +0,0 @@ ---- - -ansible_managed_server: True -ansible_managed_build: True - -h_v_add_auth_keys: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJhcbPmN6qjd+KI5t8tOVJYqS/8Jef2bAUZFlLYU6kBxZDa0Qu7Hg30z50hFcavoM6Dnh24kiZHsvCdKZ3u8mr6WhaJzDPxDm8YKk2U5WOKrQ48eq4LKU3dIOiO/5M0u90P51hF90J8/bgmp9HpNL31/8g6RT2kjBkwk62ATXF4eb0kyENHPdDn2axInKQ3z8sxhpCWhWE6J/LKIPI5J66E7F+CR7rhvk2h0ikGyBy8xZhJWY/U/IDyDV0JmvW6TNmXi4bUvUhm2lY7PRen6Xvq5UAEjC3K4YtcBCLrNtfyIR7N7vHTuuaDUjdOGCF88KdzxZ5AxIPmhN9WVj+HydCJjB1TiAzINg2egZ3Ot4juXVAi5QbU5Addw0yJdoTwGHe0mrjQ1e+VsMziDR2wZvpsU+x+D8xWmsBAh+V4vDm9gowVo5vPfFMRxAlPktNtrERSNB84OwCLtrhDc+a6BGxVuR1EHbt9H2hAUfsxRVSmwGGm5bG4QOI/DbUsARhthiYQ2Q7cNXGl0UrMkxfFpO86fiH35j3F8Cqr9oQTJOnaK64e8+zwbw+L0XxVPtAPgIGsNeNbam+ALIlbj9RQP1Cin0dlq3QCdEZ1UWdcN38RL+z27LzMgubFnapnWnlmnjqtfKAXldwwQxe1qsdWvzMA4PE/AEUF+NL5w89TYUWdw== maesto@GLaDOS diff --git a/inventory/host_vars/spinat.freifunk-mwu.de b/inventory/host_vars/spinat.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/spinat.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/suesskartoffel.freifunk-mwu.de b/inventory/host_vars/suesskartoffel.freifunk-mwu.de deleted file mode 100644 index 9e44bdf..0000000 --- a/inventory/host_vars/suesskartoffel.freifunk-mwu.de +++ /dev/null @@ -1,7 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing - -h_v_add_auth_keys: | - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt00Ozv50kIis7YKBaey5alVps98ZzW4CVO9tA8AHvsGXn8cleROjcGdbz/YwPm2RH+A+GQrRqCuEf3SPVxvthlVUuHQPKzDdX3PpcakN05CoEwR3zVwjwdzXaO3fKbN5ZCEUKTpaJU6Lngi6vO6HLzsuYloSJs3t7PGpV1xp3YESyXX7D78w9YRJSe2n3WMrA40lQ91u79V0efoX1mKQYzPH86uwhWsOqi08DvE6gxsqKMY6P06nljmsQOFsdX8S/HVrWtIcnne50b63vPMMLRkOLa5FP6qMIjU3LiirrpL80r1gmVZGVRHO6uJr+mrOb6A76cZ7LT8jaKFgnVhOyw== msslovi0@wyoming.local diff --git a/inventory/host_vars/wasserfloh.freifunk-mwu.de b/inventory/host_vars/wasserfloh.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/wasserfloh.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/host_vars/zuckerwatte.freifunk-mwu.de b/inventory/host_vars/zuckerwatte.freifunk-mwu.de deleted file mode 100644 index 9fa8544..0000000 --- a/inventory/host_vars/zuckerwatte.freifunk-mwu.de +++ /dev/null @@ -1,12 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing - -h_v_add_auth_keys: | - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHs63QNerevCI6wt2Gpq/IpHTPVeHIP8aKIOrRCUlKWR ccgx@small-x - ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAwbfFERETgOAF7iOJFTfJAXQwOWykceRXa151PWG+hiln8X2729tdFyEhztL0tJ0ln+VCj29KLc4mG23qCBW48d35btZTkdVUhFSY/PY/bMQEBiWG2MCAWxJ329i/Blw92xvlFARJNhyPzKSxgYYGRhkncbcKXoX9QWhCBY8KfH+08X9tFOxj4osYn/+dXm7Sg5mqJG4ETmdAAy5afNGE+K+NyBafcg35Y+gBfxNzilGc2/2I0lSsiEcUr+StNxhMMZ/NtQ1N2G9iPziqpu/LYlPl/2mtya+6MPtfSfoYpggIyMqcT+KSPsmxyJod0SrI1vgrX7qa0aJV08dN+gThDb8pOBEb6NG2iQEIbmTKy7XoSpF13lnAVDtPv20PjLpUR6IKZtWNnlN2hVtZLhgyeEIDMnVjmNwloItkqsKP1H96eLSoj1g9B9IOYPPxq5pf6VJKizFAI0jsxGZk0gX/QX4DoVxrD57KXrHKEuFAM4eIjHKMXeRq3Ewbn3bHT1QXevjwBtoW2hxY8Pligc0W0sHt2jW0MxaSiE0LM+hGk0Jy9rquC3+gGU7fD2kLM6nff3wzQJXCORkfdyqvMFUqwpkZmjL4qCypt04peTwkWzs/W4LlHWyc4CJGp0jKIAOA8JRxs/FJf9CyN8N+0AY6xXAZ1UPqs+wPkZ9j5hYcaHs= magic - ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhrDPtvVZb9I7Z2dXl3IXa34sT41/7YCl0kBJ2pgOzrTqXn6HjM8iY7duMxr1ScWlsaIoJAJmpML1LM7hkRJiray5YgjXjcNaz8HxDkV/JLLUMqzQSeDuVTFZzrQBQknzEehuA6XPTLRcgPMnpKhyt3TU4E3rHTDEFLHGEn2I9IZeImGdrehgWoJQz0gGyXI5h49bj6AXHz4etgH349ZCvQWY2e/127owcoPK5EyFBsDMKgnfdxCpAHa3vWFdUnbwqHiVu445qr2U4PiG2AK6PZKRsMauR9jBG1EfeRrc7STcx3OYRbBaQoHJkvw8dD0bH5tI1VVnXfZ2CYOyIGWHJw== mitch - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDUI92QCs7D8mpCoqUug1fOcKf7V5nyKZJiyFfsz0T/ ccgx@mobile-x - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFx5FdrQYkd11mEBxEZLUjdI1gOlee8kP+imUTInsYGK9r3wuoiVoWX4ZdemhB6ezmJwY7mmqjHpFixct3FDdZDvoQjbbS0jM9zQtLp3quHlgpbhCSCG0NOzsjRMJhV1rQguVXDBcDxXZf1YDr9S4YJWPJ1USPPE9IILdbDl6lgaTxsEpeL6unQ3SHUkwLnQVnof1DAsS9yyyDouKMAnoiLIqOi2firerm+2KjtWXpQGF8d58eXg8FSy6iWHmy+mEOBo5W2vy8CT80hR72Ynyy4JjijvSjUzqHs9bJjxCVWOV1/4sZ5GUgNzNknIduny4tR744JRmWDfeCjCS9T3TdpKbL7Xd6pjPW4/q5Z3u0DZFutR3tBp0Xm69ic4QQZVMa14FZcipKNdE+uTpIzfpClz2e4RBR8DlJn2DexvEGSGJu3t8uOFqVnJrkmJL/eIWkRpYe+JvpaF7M7K+dM/aQWOtoTWQrmujGUqXLvSyFnuUk4PhPc3an+HaxYFCBcVGQHypc7VyAg/Bm14ZBYbj93c0UTUV01VKu5/tCjq42+hDvMsn1ZyuZ66hnnZizLzIZGH3ciGdZwPp+32nC0sT09Y8pbAZFhN6sfQHDvVrHpOjJXmbBKZ2xjYoUKoi4rdds7sLhvuJV0a3i56WR8CCIx94UGjxkfJ0A9RR24AlAuQ== mattsches@gmail.com - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt00Ozv50kIis7YKBaey5alVps98ZzW4CVO9tA8AHvsGXn8cleROjcGdbz/YwPm2RH+A+GQrRqCuEf3SPVxvthlVUuHQPKzDdX3PpcakN05CoEwR3zVwjwdzXaO3fKbN5ZCEUKTpaJU6Lngi6vO6HLzsuYloSJs3t7PGpV1xp3YESyXX7D78w9YRJSe2n3WMrA40lQ91u79V0efoX1mKQYzPH86uwhWsOqi08DvE6gxsqKMY6P06nljmsQOFsdX8S/HVrWtIcnne50b63vPMMLRkOLa5FP6qMIjU3LiirrpL80r1gmVZGVRHO6uJr+mrOb6A76cZ7LT8jaKFgnVhOyw== msslovi0@wyoming.local diff --git a/inventory/host_vars/zwiebel.freifunk-mwu.de b/inventory/host_vars/zwiebel.freifunk-mwu.de deleted file mode 100644 index bc82ec6..0000000 --- a/inventory/host_vars/zwiebel.freifunk-mwu.de +++ /dev/null @@ -1,4 +0,0 @@ ---- - -ansible_managed_server: True -# not yet: ansible_managed_meshing diff --git a/inventory/hosts b/inventory/hosts index 4dc8637..835030a 100644 --- a/inventory/hosts +++ b/inventory/hosts @@ -1,37 +1,10 @@ -[gates] -spinat.freifunk-mwu.de -lotuswurzel.freifunk-mwu.de -wasserfloh.freifunk-mwu.de -# kaschu.freifunk-mwu.de # außer Dienst -ingwer.freifunk-mwu.de # (Debian) -#mettigel.freifunk-mwu.de -#parmesan.freifunk-mwu.de -extrasahne.freifunk-mwu.de require_dns=False # (Debian 8) FIXME: set IPv6 +[ffmwu-servers:children] +ffmwu-gateways +ffmwu-build-servers -[meshing-srv:children] -gates -meshing-only-srv -test-vms +[ffmwu-gateways] -[meshing-only-srv] -aubergine.freifunk-mwu.de # int. DNS-master -zuckerwatte.freifunk-mwu.de # web, blogs, wiki -churro.freifunk-mwu.de # Abloesung: web, blogs, wiki (Debian) -glueckskeks.freifunk-mwu.de # -zwiebel.freifunk-mwu.de # -suesskartoffel.freifunk-mwu.de # - -[ff-servers:children] -gates -meshing-only-srv -simple-ff-servers -build-servers -test-vms - -[simple-ff-servers] # not meshing -linse.freifunk-mwu.de # ext. DNS-master - -[build-servers] +[ffmwu-build-servers] milchreis.freifunk-mwu.de [test-vms] diff --git a/playbook-build-server.yml b/playbook-build-server.yml index 958d485..7b76e33 100755 --- a/playbook-build-server.yml +++ b/playbook-build-server.yml @@ -1,8 +1,7 @@ #!/usr/bin/ansible-playbook --- -- hosts: build-servers +- hosts: ffmwu-build-servers remote_user: admin - strategy: linear roles: - ffmwu-build diff --git a/playbook-test-prereqs.yml b/playbook-test-prereqs.yml index 7f740e5..f96d426 100755 --- a/playbook-test-prereqs.yml +++ b/playbook-test-prereqs.yml @@ -1,9 +1,8 @@ #!/usr/bin/ansible-playbook --- -- hosts: ff-servers +- hosts: ffmwu-servers remote_user: admin - strategy: free roles: - - ffmwu-prereqs + - test-prerequisites diff --git a/roles/ffmwu-prereqs/tasks/main.yml b/roles/test-prerequisites/tasks/main.yml similarity index 100% rename from roles/ffmwu-prereqs/tasks/main.yml rename to roles/test-prerequisites/tasks/main.yml