Move script to templates

2 files changed, 12 insertions, 9 deletions

diff --git a/myansible.sh b/myansible.sh
index 3af898d..1e4d15b 100755
--- a/myansible.sh
+++ b/myansible.sh
@@ -3,12 +3,15 @@
 ## wrapper for ansible, ensuring password is provided
 
 if ! ssh-add -l >/dev/null; then
-ssh-add ~/.ssh/ansible
-ssh-add ~/.ssh/id_hetz
-ssh-add ~/.ssh/id_netcup
-ssh-add ~/.ssh/id_rsa
-ssh-add ~/.ssh/firstroot
-ssh-add ~/.ssh/gcloud
+ssh-add ~/.ssh/ansible \
+  ~/.ssh/id_hetz \
+  ~/.ssh/id_netcup \
+  ~/.ssh/id_rsa \
+  ~/.ssh/firstroot \
+  ~/.ssh/gcloud \
+  ~/.ssh/virtuacloud \
+  ~/.ssh/ifog_otter
 fi
 
-ansible-playbook --ask-vault-pass -e '@passwd.yml' $@
+./venv/bin/ansible-playbook --ask-vault-pass -e '@passwd.yml' $@
+# -B / -P for background/polling
diff --git a/roles/linux-ns/files/usrlocalbin/dn42-route-namespace.sh b/roles/linux-ns/templates/dn42-route-namespace.sh
index 44e0e61..6822834 100755
--- a/roles/linux-ns/files/usrlocalbin/dn42-route-namespace.sh
+++ b/roles/linux-ns/templates/dn42-route-namespace.sh
@@ -4,12 +4,12 @@ set -eu
 
 # Set public IPv6 network prefix in the form aaaa:bbbb:cccc:dddd
 # (yes, without trailing: or ::)
-hoster_prefix_v6="<insert ipv6 prefix>"
+hoster_prefix_v6="{{ hoster_ipv6_prefix }}"
 # hardcoded: use 42 prefix
 ns_prefix_v6="${hoster_prefix_v6}:42"
 
 # insert IPv4 address
-hoster_addr_v4="<insert ipv4>"
+hoster_addr_v4="{{ hoster_ipv4_address }}"
 # hardcoded: net
 ns_net_v4="10.42.0.0/24"
 # hardcoded: peer address (inside namespace)