summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-02-24 17:27:55 +0200
committerLars Wirzenius <liw@liw.fi>2017-02-24 17:27:55 +0200
commita74cbb82645238f96222be5f65943c0c79c2ae52 (patch)
tree4f740a6d00b352ca8e8edc89b073579df1f14e1b
parent4fc4881b6ccbf73bbfdeac9192452ccb93b40c13 (diff)
downloadansibleness-a74cbb82645238f96222be5f65943c0c79c2ae52.tar.gz
Move vars out of obbench.yml
-rw-r--r--ansible/group_vars/infinland.yml5
-rw-r--r--ansible/host_vars/e2obbench.yml1
-rw-r--r--ansible/obbench.yml7
3 files changed, 6 insertions, 7 deletions
diff --git a/ansible/group_vars/infinland.yml b/ansible/group_vars/infinland.yml
new file mode 100644
index 0000000..0bb6e57
--- /dev/null
+++ b/ansible/group_vars/infinland.yml
@@ -0,0 +1,5 @@
+debian_mirror: http://ftp.fi.debian.org/debian
+debian_mirror_src: http://httpredir.debian.org/debian
+sshforward_key: "{{ lookup('pipe', 'pass show sshforward/e2obbench') }}"
+sshforward_key_pub: >
+ {{ lookup('pipe', 'pass show sshforward/e2obbench.pub') }}
diff --git a/ansible/host_vars/e2obbench.yml b/ansible/host_vars/e2obbench.yml
new file mode 100644
index 0000000..0da10c2
--- /dev/null
+++ b/ansible/host_vars/e2obbench.yml
@@ -0,0 +1 @@
+sshforward_port: 22055
diff --git a/ansible/obbench.yml b/ansible/obbench.yml
index 4a14872..ba6993d 100644
--- a/ansible/obbench.yml
+++ b/ansible/obbench.yml
@@ -2,13 +2,6 @@
- hosts: e2obbench
remote_user: ansible
become: yes
- vars:
- debian_mirror: http://ftp.fi.debian.org/debian
- debian_mirror_src: http://httpredir.debian.org/debian
- sshforward_key: "{{ lookup('pipe', 'pass show sshforward/e2obbench') }}"
- sshforward_key_pub: >
- {{ lookup('pipe', 'pass show sshforward/e2obbench.pub') }}
- sshforward_port: 22055
roles:
- sane-debian-system
- liw-usual