Feat(run-role): Run a role using a universal playbook

diff --git a/playbooks/debian-init-system.sh b/playbooks/debian-init-system.sh
index bc2cc93c543e35ca687f6f1fac95459569b9e5e5..3ff2524b1def932fad9f397468bfebebc2b654d4 100755 (executable)
--- a/playbooks/debian-init-system.sh
+++ b/playbooks/debian-init-system.sh
@@ -4,5 +4,4 @@ cd "`dirname \"$0\"`" &&
 
 # Passwordless access isn't configured yet; use `ssh` connection sharing.
 # `sudo` isn't configured yet too; use `su` and ask for root password.
-exec ansible-playbook debian-init-system.yml debian-init-user-phd.yml \
-   "$@" --become-method=su -Kv
+exec ansible-playbook debian-init-system.yml "$@" --become-method=su -Kv

diff --git a/playbooks/debian-init-system.yml b/playbooks/debian-init-system.yml
index 61be2f431693c47e14c53b24601cdae6fa7400a0..1418f14c45277855dd4a1b8df6f52b36aa851234 100644 (file)
--- a/playbooks/debian-init-system.yml
+++ b/playbooks/debian-init-system.yml
@@ -4,3 +4,4 @@
   roles:
     - debian-init-system
     - debian-sudo
+    - debian-phd

diff --git a/playbooks/debian-init-user-phd.yml b/playbooks/debian-init-user-phd.yml
deleted file mode 100644 (file)
index d14f4af..0000000
--- a/playbooks/debian-init-user-phd.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: Create user phd
-  hosts: "{{ hosts | default('servers') }}"
-  gather_facts: false
-  roles:
-    - debian-phd

diff --git a/playbooks/run-role b/playbooks/run-role
new file mode 100755 (executable)
index 0000000..f2ea245
--- /dev/null
+++ b/playbooks/run-role
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+if [ -z "$1" ]; then
+   echo "Usage: $0 role" >&2
+   exit 1
+fi
+
+role="$1"
+shift
+
+cd "`dirname \"$0\"`" &&
+ansible-playbook run-role.yml "$@" -e role="$role"

diff --git a/playbooks/debian-logcheck.yml b/playbooks/run-role.yml
similarity index 53%
rename from playbooks/debian-logcheck.yml
rename to playbooks/run-role.yml
index 1311f450cedaabf8031139eb035e0a361e4c18f0..bc179640cb6e2d762434f97ce3e75a59ff8b831f 100644 (file)
--- a/playbooks/debian-logcheck.yml
+++ b/playbooks/run-role.yml
@@ -1,5 +1,5 @@
-- name: Update logcheck ignore patterns
+- name: "Run role {{ role }}"
   hosts: "{{ hosts | default('all') }}"
   gather_facts: false
   roles:
-    - debian-logcheck
+    - "{{ role }}"