From 6d50364ceabdd18b1877c18092d852e7f64e91c9 Mon Sep 17 00:00:00 2001
From: mg <michael.grote@posteo.de>
Date: Sat, 6 Feb 2021 18:34:31 +0100
Subject: [PATCH] Vorbereitung Cluster

---
 .ansible-lint          |  4 ----
 .gitmodules            |  3 ---
 .remote-sync.json      |  2 +-
 README.md              |  5 +++++
 group_vars/all.yml     |  2 +-
 group_vars/ansible.yml |  1 +
 inventory              | 15 ++-------------
 7 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index cdccdc4c..fce8a75c 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,9 +1,5 @@
 
 exclude_paths:
-  - roles/stefangweichinger.rclone/
-  - roles/igor_mukhin.bash_aliases/
-  - roles/nickjj.ansible-user/
-  - roles/azavea.ansible-pip/
   - roles/riemers.gitlab-runner/
 
 parseable: true
diff --git a/.gitmodules b/.gitmodules
index a01ff4c2..4d501cc5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "roles/geerlingguy.pip"]
 	path = roles/geerlingguy.pip
 	url = https://github.com/geerlingguy/ansible-role-pip
-[submodule "roles/nickjj.ansible-user"]
-	path = roles/nickjj.ansible-user
-	url = https://github.com/nickjj/ansible-user
 [submodule "roles/oefenweb.ufw"]
 	path = roles/oefenweb.ufw
 	url = https://github.com/Oefenweb/ansible-ufw
diff --git a/.remote-sync.json b/.remote-sync.json
index 06776a8a..065d34e0 100644
--- a/.remote-sync.json
+++ b/.remote-sync.json
@@ -2,7 +2,7 @@
   "uploadOnSave": true,
   "useAtomicWrites": true,
   "deleteLocal": false,
-  "hostname": "ansible.grote.lan",
+  "hostname": "ansible2.grote.lan",
   "port": "22",
   "target": "/home/mg/ansible",
   "ignore": [
diff --git a/README.md b/README.md
index 005674e1..9948d1cf 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 [![pipeline status](http://git.mgrote.net/mg/ansible/badges/master/pipeline.svg)](http://git.mgrote.net/mg/ansible/-/commits/master)
 
+## Dateirechte
+```bash
+chmod 0400 vault-pass.yml id_rsa_ansible_user
+```
+
 ## Ansible KeePass Lookup Plugin aktualisieren
 
 ```bash
diff --git a/group_vars/all.yml b/group_vars/all.yml
index b3d7cd81..ca2ac5c4 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -82,6 +82,7 @@
   ### mgrote.install_packages
   programs_common:
     - locales
+    - python
     - build-essential
     - ntp
     - htop
@@ -122,7 +123,6 @@
   # Ansible Plugin Variablen
   ### Keepass
   # https://github.com/viczem/ansible-keepass
-  # liegt unter ./plugins/lookup/keepass.py
   keepass_dbx: "./keepass_db.kdbx"
   keepass_psw: !vault |
           $ANSIBLE_VAULT;1.1;AES256
diff --git a/group_vars/ansible.yml b/group_vars/ansible.yml
index e6b41fd8..36fb0eef 100644
--- a/group_vars/ansible.yml
+++ b/group_vars/ansible.yml
@@ -14,3 +14,4 @@
   ### mgrote.install_packages
   programs_extra:
     - graphviz # für ansible-playbook-grapher
+    - sshpass
diff --git a/inventory b/inventory
index 7cdafa6b..05103f55 100644
--- a/inventory
+++ b/inventory
@@ -22,7 +22,7 @@ all:
         acng-test.grote.lan:
     ansible:
       hosts:
-        ansible.grote.lan:
+        ansible2.grote.lan:
         ansible-test.grote.lan:
     docker:
       hosts:
@@ -44,17 +44,6 @@ all:
       hosts:
         gitlab-runner-test.grote.lan:
         gitlab-runner.grote.lan:
-#    wsl:
-#      hosts:
-#        irantu.grote.lan:
-#    baseimage:
-#      hosts:
-#        vorlagebaseimage.grote.lan:
-#    qmk:
-#      hosts:
-#        qmk.grote.lan:
-
-
 
     production:
       hosts:
@@ -63,7 +52,7 @@ all:
         fileserver2.grote.lan:
         pi.hole:
         acng.grote.lan:
-        ansible.grote.lan:
+        ansible2.grote.lan:
         docker.grote.lan:
         pve2.grote.lan:
         gitlab.grote.lan: