Add 'skip::<role_name>' Ansible tags in playbooks

debops · Sep 28, 2018 · 953eadf · 953eadf
1 parent 163e7bb
commit 953eadf
Show file tree

Hide file tree

Showing 143 changed files with 355 additions and 350 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -36,6 +36,11 @@ Added
   default). This can be used to create unprivileged LXC containers owned by
   ``root``. See the release notes for potential issues on existing systems.
 
+- DebOps roles are now tagged with ``skip::<role_name>`` Ansible tags. You can
+  use these tags to skip roles without any side-effects; for example
+  "<role_name>/env" sub-roles will still run so that roles that depend on them
+  will work as expected.
+
 Changed
 ~~~~~~~
 

diff --git a/ansible/playbooks/bootstrap.yml b/ansible/playbooks/bootstrap.yml
@@ -48,13 +48,13 @@
   roles:
 
     - role: debops.python
-      tags: [ 'role::python' ]
+      tags: [ 'role::python', 'skip::python' ]
 
     - role: debops.sudo
-      tags: [ 'role::sudo', 'role::system_groups' ]
+      tags: [ 'role::sudo', 'skip::sudo', 'role::system_groups' ]
 
     - role: debops.system_groups
-      tags: [ 'role::system_groups' ]
+      tags: [ 'role::system_groups', 'skip::system_groups' ]
 
     - role: debops.bootstrap
-      tags: [ 'role::bootstrap' ]
+      tags: [ 'role::bootstrap', 'skip::bootstrap' ]
diff --git a/ansible/playbooks/common.yml b/ansible/playbooks/common.yml
@@ -31,13 +31,13 @@
   roles:
 
     - role: debops.etckeeper
-      tags: [ 'role::etckeeper' ]
+      tags: [ 'role::etckeeper', 'skip::etckeeper' ]
 
     - role: debops.debops_fact
-      tags: [ 'role::debops_fact' ]
+      tags: [ 'role::debops_fact', 'skip::debops_fact' ]
 
     - role: debops.environment
-      tags: [ 'role::environment' ]
+      tags: [ 'role::environment', 'skip::environment' ]
 
     - role: debops.nullmailer/env
       tags: [ 'role::nullmailer', 'role::ferm', 'role::tcpwrappers' ]
@@ -51,67 +51,67 @@
         - '{{ pki_env_secret_directories }}'
 
     - role: debops.root_account
-      tags: [ 'role::root_account' ]
+      tags: [ 'role::root_account', 'skip::root_account' ]
 
     - role: debops.apt_preferences
-      tags: [ 'apt_preferences', 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ sshd__apt_preferences__dependent_list }}'
         - '{{ apt__apt_preferences__dependent_list }}'
         - '{{ apt_install__apt_preferences__dependent_list }}'
         - '{{ rsyslog__apt_preferences__dependent_list }}'
 
     - role: debops.apt_proxy
-      tags: [ 'role::apt_proxy' ]
+      tags: [ 'role::apt_proxy', 'skip::apt_proxy' ]
 
     - role: debops.atd
-      tags: [ 'role::atd' ]
+      tags: [ 'role::atd', 'skip::atd' ]
 
     - role: debops.dhparam
-      tags: [ 'role::dhparam' ]
+      tags: [ 'role::dhparam', 'skip::dhparam' ]
 
     - role: debops.pki
-      tags: [ 'role::pki' ]
+      tags: [ 'role::pki', 'skip::pki' ]
 
     - role: debops.apt
-      tags: [ 'role::apt' ]
+      tags: [ 'role::apt', 'skip::apt' ]
 
     - role: debops.python
-      tags: [ 'role::python' ]
+      tags: [ 'role::python', 'skip::python' ]
 
     - role: debops.apt_listchanges
-      tags: [ 'role::apt_listchanges' ]
+      tags: [ 'role::apt_listchanges', 'skip::apt_listchanges' ]
 
     - role: debops.apt_install
-      tags: [ 'role::apt_install' ]
+      tags: [ 'role::apt_install', 'skip::apt_install' ]
 
     - role: debops.sudo
-      tags: [ 'role::sudo' ]
+      tags: [ 'role::sudo', 'skip::sudo' ]
 
     - role: debops.system_groups
-      tags: [ 'role::system_groups' ]
+      tags: [ 'role::system_groups', 'skip::system_groups' ]
 
     - role: debops.etc_services
-      tags: [ 'role::etc_services' ]
+      tags: [ 'role::etc_services', 'skip::etc_services' ]
       etc_services__dependent_list:
         - '{{ rsyslog__etc_services__dependent_list }}'
 
     - role: debops.logrotate
-      tags: [ 'role::logrotate' ]
+      tags: [ 'role::logrotate', 'skip::logrotate' ]
       logrotate__dependent_config:
         - '{{ rsyslog__logrotate__dependent_config }}'
 
     - role: debops.auth
-      tags: [ 'role::auth' ]
+      tags: [ 'role::auth', 'skip::auth' ]
 
     - role: debops.nsswitch
-      tags: [ 'role::nsswitch' ]
+      tags: [ 'role::nsswitch', 'skip::nsswitch' ]
 
     - role: debops.machine
-      tags: [ 'role::machine' ]
+      tags: [ 'role::machine', 'skip::machine' ]
 
     - role: debops.resources
-      tags: [ 'role::resources' ]
+      tags: [ 'role::resources', 'skip::resources' ]
 
     - role: debops.ferm
       tags: [ 'role::ferm', 'skip::ferm' ]
@@ -122,46 +122,46 @@
         - '{{ sshd__ferm__dependent_rules }}'
 
     - role: debops.tcpwrappers
-      tags: [ 'role::tcpwrappers' ]
+      tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ]
       tcpwrappers_dependent_allow:
         - '{{ nullmailer__tcpwrappers__dependent_allow }}'
         - '{{ sshd__tcpwrappers__dependent_allow }}'
 
     - role: debops.locales
-      tags: [ 'role::locales' ]
+      tags: [ 'role::locales', 'skip::locales' ]
 
     - role: debops.ntp
-      tags: [ 'role::ntp' ]
+      tags: [ 'role::ntp', 'skip::ntp' ]
 
     - role: debops.proc_hidepid
-      tags: [ 'role::proc_hidepid' ]
+      tags: [ 'role::proc_hidepid', 'skip::proc_hidepid' ]
 
     - role: debops.console
-      tags: [ 'role::console' ]
+      tags: [ 'role::console', 'skip::console' ]
 
     - role: debops.sysctl
-      tags: [ 'role::sysctl' ]
+      tags: [ 'role::sysctl', 'skip::sysctl' ]
 
     - role: debops.nullmailer
-      tags: [ 'role::nullmailer' ]
+      tags: [ 'role::nullmailer', 'skip::nullmailer' ]
 
     - role: debops.rsyslog
-      tags: [ 'role::rsyslog' ]
+      tags: [ 'role::rsyslog', 'skip::rsyslog' ]
 
     - role: debops.unattended_upgrades
-      tags: [ 'role::unattended_upgrades' ]
+      tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ]
 
     - role: debops.users
-      tags: [ 'role::users' ]
+      tags: [ 'role::users', 'skip::users' ]
 
     - role: debops.authorized_keys
-      tags: [ 'role::authorized_keys' ]
+      tags: [ 'role::authorized_keys', 'skip::authorized_keys' ]
 
     - role: debops.sshd
-      tags: [ 'role::sshd' ]
+      tags: [ 'role::sshd', 'skip::sshd' ]
 
     - role: debops.cron
-      tags: [ 'role::cron' ]
+      tags: [ 'role::cron', 'skip::cron' ]
 
     - role: debops.apt_mark
-      tags: [ 'role::apt_mark' ]
+      tags: [ 'role::apt_mark', 'skip::apt_mark' ]
diff --git a/ansible/playbooks/service/ansible.yml b/ansible/playbooks/service/ansible.yml
@@ -11,9 +11,9 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ ansible__apt_preferences__dependent_list }}'
 
     - role: debops.ansible
-      tags: [ 'role::ansible' ]
+      tags: [ 'role::ansible', 'skip::ansible' ]
diff --git a/ansible/playbooks/service/apache.yml b/ansible/playbooks/service/apache.yml
@@ -19,4 +19,4 @@
         - '{{ apache__ferm__dependent_rules }}'
 
     - role: debops.apache
-      tags: [ 'role::apache' ]
+      tags: [ 'role::apache', 'skip::apache' ]
diff --git a/ansible/playbooks/service/apt.yml b/ansible/playbooks/service/apt.yml
@@ -11,9 +11,9 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ apt__apt_preferences__dependent_list }}'
 
     - role: debops.apt
-      tags: [ 'role::apt' ]
+      tags: [ 'role::apt', 'skip::apt' ]
diff --git a/ansible/playbooks/service/apt_cacher_ng.yml b/ansible/playbooks/service/apt_cacher_ng.yml
@@ -11,12 +11,12 @@
   roles:
 
     - role: debops.etc_services
-      tags: [ 'role::etc_services' ]
+      tags: [ 'role::etc_services', 'skip::etc_services' ]
       etc_services__dependent_list:
         - '{{ apt_cacher_ng__etc_services__dependent_list }}'
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ apt_cacher_ng__apt_preferences__dependent_list }}'
         - '{{ nginx_apt_preferences_dependent_list }}'
@@ -28,11 +28,11 @@
         - '{{ nginx_ferm_dependent_rules }}'
 
     - role: debops.nginx
-      tags: [ 'role::nginx' ]
+      tags: [ 'role::nginx', 'skip::nginx' ]
       nginx_servers:
         - '{{ apt_cacher_ng__nginx__servers }}'
       nginx_upstreams:
         - '{{ apt_cacher_ng__nginx__upstream }}'
 
     - role: debops.apt_cacher_ng
-      tags: [ 'role::apt_cacher_ng' ]
+      tags: [ 'role::apt_cacher_ng', 'skip::apt_cacher_ng' ]
diff --git a/ansible/playbooks/service/apt_install.yml b/ansible/playbooks/service/apt_install.yml
@@ -11,9 +11,9 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ apt_install__apt_preferences__dependent_list }}'
 
     - role: debops.apt_install
-      tags: [ 'role::apt_install' ]
+      tags: [ 'role::apt_install', 'skip::apt_install' ]
diff --git a/ansible/playbooks/service/apt_listchanges.yml b/ansible/playbooks/service/apt_listchanges.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.apt_listchanges
-      tags: [ 'role::apt_listchanges' ]
+      tags: [ 'role::apt_listchanges', 'skip::apt_listchanges' ]
diff --git a/ansible/playbooks/service/apt_mark.yml b/ansible/playbooks/service/apt_mark.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.apt_mark
-      tags: [ 'role::apt_mark' ]
+      tags: [ 'role::apt_mark', 'skip::apt_mark' ]
diff --git a/ansible/playbooks/service/apt_preferences.yml b/ansible/playbooks/service/apt_preferences.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
diff --git a/ansible/playbooks/service/apt_proxy.yml b/ansible/playbooks/service/apt_proxy.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.apt_proxy
-      tags: [ 'role::apt_proxy' ]
+      tags: [ 'role::apt_proxy', 'skip::apt_proxy' ]
diff --git a/ansible/playbooks/service/atd.yml b/ansible/playbooks/service/atd.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.atd
-      tags: [ 'role::atd' ]
+      tags: [ 'role::atd', 'skip::atd' ]
diff --git a/ansible/playbooks/service/auth.yml b/ansible/playbooks/service/auth.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.auth
-      tags: [ 'role::auth' ]
+      tags: [ 'role::auth', 'skip::auth' ]
diff --git a/ansible/playbooks/service/authorized_keys.yml b/ansible/playbooks/service/authorized_keys.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.authorized_keys
-      tags: [ 'role::authorized_keys' ]
+      tags: [ 'role::authorized_keys', 'skip::authorized_keys' ]
diff --git a/ansible/playbooks/service/avahi.yml b/ansible/playbooks/service/avahi.yml
@@ -16,7 +16,7 @@
         - '{{ avahi__ferm__dependent_rules }}'
 
     - role: debops.avahi
-      tags: [ 'role::avahi' ]
+      tags: [ 'role::avahi', 'skip::avahi' ]
 
     - role: debops.nsswitch
-      tags: [ 'role::nsswitch' ]
+      tags: [ 'role::nsswitch', 'skip::nsswitch' ]
diff --git a/ansible/playbooks/service/boxbackup.yml b/ansible/playbooks/service/boxbackup.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.boxbackup
-      tags: [ 'role::boxbackup' ]
+      tags: [ 'role::boxbackup', 'skip::boxbackup' ]
diff --git a/ansible/playbooks/service/console.yml b/ansible/playbooks/service/console.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.console
-      tags: [ 'role::console' ]
+      tags: [ 'role::console', 'skip::console' ]
diff --git a/ansible/playbooks/service/core.yml b/ansible/playbooks/service/core.yml
@@ -11,5 +11,5 @@
   roles:
 
     - role: debops.core
-      tags: [ 'role::core' ]
+      tags: [ 'role::core', 'skip::core' ]
       become: True
diff --git a/ansible/playbooks/service/cran.yml b/ansible/playbooks/service/cran.yml
@@ -11,16 +11,16 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ cran__apt_preferences__dependent_list }}'
         - '{{ java__apt_preferences__dependent_list
               if cran__java_integration|bool else [] }}'
 
     - role: debops.java
-      tags: [ 'role::java' ]
+      tags: [ 'role::java', 'skip::java' ]
       java__install_jdk: True
       when: cran__java_integration|bool
 
     - role: debops.cran
-      tags: [ 'role::cran' ]
+      tags: [ 'role::cran', 'skip::cran' ]
diff --git a/ansible/playbooks/service/cron.yml b/ansible/playbooks/service/cron.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.cron
-      tags: [ 'role::cron' ]
+      tags: [ 'role::cron', 'skip::cron' ]
diff --git a/ansible/playbooks/service/cryptsetup-persistent_paths.yml b/ansible/playbooks/service/cryptsetup-persistent_paths.yml
@@ -11,8 +11,8 @@
   roles:
 
     - role: debops.cryptsetup
-      tags: [ 'role::cryptsetup' ]
+      tags: [ 'role::cryptsetup', 'skip::cryptsetup' ]
 
     - role: debops.persistent_paths
-      tags: [ 'role::persistent_paths' ]
+      tags: [ 'role::persistent_paths', 'skip::persistent_paths' ]
       persistent_paths__dependent_paths: '{{ cryptsetup__persistent_paths__dependent_paths }}'
diff --git a/ansible/playbooks/service/cryptsetup-plain.yml b/ansible/playbooks/service/cryptsetup-plain.yml
@@ -11,4 +11,4 @@
   roles:
 
     - role: debops.cryptsetup
-      tags: [ 'role::cryptsetup' ]
+      tags: [ 'role::cryptsetup', 'skip::cryptsetup' ]
diff --git a/ansible/playbooks/service/debops.yml b/ansible/playbooks/service/debops.yml
@@ -12,12 +12,12 @@
   roles:
 
     - role: debops.apt_preferences
-      tags: [ 'role::apt_preferences' ]
+      tags: [ 'role::apt_preferences', 'skip::apt_preferences' ]
       apt_preferences__dependent_list:
         - '{{ ansible__apt_preferences__dependent_list }}'
 
     - role: debops.ansible
-      tags: [ 'role::ansible' ]
+      tags: [ 'role::ansible', 'skip::ansible' ]
 
     - role: debops.debops
-      tags: [ 'role::debops' ]
+      tags: [ 'role::debops', 'skip::debops' ]