From 953eadf85ae5991eb5a61710139d6c0ca76dc656 Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Sat, 15 Sep 2018 14:28:48 +0200 Subject: [PATCH] Add 'skip::' Ansible tags in playbooks --- CHANGELOG.rst | 5 ++ ansible/playbooks/bootstrap.yml | 8 +-- ansible/playbooks/common.yml | 70 +++++++++---------- ansible/playbooks/service/ansible.yml | 4 +- ansible/playbooks/service/apache.yml | 2 +- ansible/playbooks/service/apt.yml | 4 +- ansible/playbooks/service/apt_cacher_ng.yml | 8 +-- ansible/playbooks/service/apt_install.yml | 4 +- ansible/playbooks/service/apt_listchanges.yml | 2 +- ansible/playbooks/service/apt_mark.yml | 2 +- ansible/playbooks/service/apt_preferences.yml | 2 +- ansible/playbooks/service/apt_proxy.yml | 2 +- ansible/playbooks/service/atd.yml | 2 +- ansible/playbooks/service/auth.yml | 2 +- ansible/playbooks/service/authorized_keys.yml | 2 +- ansible/playbooks/service/avahi.yml | 4 +- ansible/playbooks/service/boxbackup.yml | 2 +- ansible/playbooks/service/console.yml | 2 +- ansible/playbooks/service/core.yml | 2 +- ansible/playbooks/service/cran.yml | 6 +- ansible/playbooks/service/cron.yml | 2 +- .../service/cryptsetup-persistent_paths.yml | 4 +- .../playbooks/service/cryptsetup-plain.yml | 2 +- ansible/playbooks/service/debops.yml | 6 +- ansible/playbooks/service/debops_api.yml | 6 +- ansible/playbooks/service/debops_fact.yml | 2 +- ansible/playbooks/service/debops_legacy.yml | 2 +- ansible/playbooks/service/dhcpd.yml | 2 +- ansible/playbooks/service/dhparam.yml | 2 +- .../service/dnsmasq-persistent_paths.yml | 6 +- ansible/playbooks/service/dnsmasq-plain.yml | 4 +- ansible/playbooks/service/docker.yml | 4 +- ansible/playbooks/service/docker_gen.yml | 2 +- ansible/playbooks/service/dokuwiki.yml | 10 +-- ansible/playbooks/service/dovecot.yml | 4 +- ansible/playbooks/service/elastic_co.yml | 4 +- ansible/playbooks/service/elasticsearch.yml | 10 +-- ansible/playbooks/service/environment.yml | 2 +- ansible/playbooks/service/etc_aliases.yml | 2 +- ansible/playbooks/service/etc_services.yml | 2 +- ansible/playbooks/service/etckeeper.yml | 2 +- ansible/playbooks/service/etherpad.yml | 16 ++--- ansible/playbooks/service/fail2ban.yml | 2 +- ansible/playbooks/service/fcgiwrap.yml | 2 +- ansible/playbooks/service/gitlab.yml | 18 ++--- ansible/playbooks/service/gitlab_runner.yml | 2 +- ansible/playbooks/service/gitusers.yml | 6 +- ansible/playbooks/service/golang.yml | 4 +- ansible/playbooks/service/grub.yml | 2 +- ansible/playbooks/service/gunicorn.yml | 6 +- ansible/playbooks/service/hashicorp.yml | 2 +- ansible/playbooks/service/hwraid.yml | 2 +- ansible/playbooks/service/icinga.yml | 6 +- ansible/playbooks/service/icinga_db.yml | 2 +- ansible/playbooks/service/icinga_web.yml | 14 ++-- ansible/playbooks/service/ifupdown.yml | 4 +- ansible/playbooks/service/ipxe.yml | 2 +- ansible/playbooks/service/iscsi.yml | 6 +- ansible/playbooks/service/java.yml | 4 +- ansible/playbooks/service/kibana.yml | 10 +-- ansible/playbooks/service/kmod.yml | 2 +- ansible/playbooks/service/librenms.yml | 12 ++-- ansible/playbooks/service/libvirt.yml | 2 +- ansible/playbooks/service/libvirtd.yml | 6 +- ansible/playbooks/service/libvirtd_qemu.yml | 2 +- ansible/playbooks/service/locales.yml | 2 +- ansible/playbooks/service/logrotate.yml | 2 +- ansible/playbooks/service/lvm.yml | 2 +- ansible/playbooks/service/lxc.yml | 4 +- ansible/playbooks/service/machine.yml | 2 +- ansible/playbooks/service/mailman.yml | 12 ++-- ansible/playbooks/service/mariadb.yml | 2 +- ansible/playbooks/service/mariadb_server.yml | 4 +- ansible/playbooks/service/memcached.yml | 2 +- ansible/playbooks/service/monit.yml | 2 +- ansible/playbooks/service/mosquitto-nginx.yml | 10 +-- ansible/playbooks/service/mosquitto-plain.yml | 6 +- ansible/playbooks/service/netbase.yml | 2 +- ansible/playbooks/service/netbox.yml | 12 ++-- ansible/playbooks/service/nfs.yml | 2 +- ansible/playbooks/service/nfs_server.yml | 6 +- ansible/playbooks/service/nginx.yml | 4 +- ansible/playbooks/service/nodejs.yml | 4 +- ansible/playbooks/service/nsswitch.yml | 2 +- ansible/playbooks/service/ntp.yml | 2 +- ansible/playbooks/service/nullmailer.yml | 4 +- ansible/playbooks/service/opendkim.yml | 4 +- ansible/playbooks/service/openvz.yml | 2 +- ansible/playbooks/service/owncloud-apache.yml | 16 ++--- ansible/playbooks/service/owncloud-nginx.yml | 16 ++--- .../playbooks/service/persistent_paths.yml | 2 +- ansible/playbooks/service/php.yml | 6 +- ansible/playbooks/service/phpipam.yml | 2 +- ansible/playbooks/service/phpmyadmin.yml | 2 +- ansible/playbooks/service/pki.yml | 2 +- ansible/playbooks/service/postconf.yml | 4 +- ansible/playbooks/service/postfix.yml | 4 +- ansible/playbooks/service/postgresql.yml | 4 +- .../playbooks/service/postgresql_server.yml | 8 +-- ansible/playbooks/service/postscreen.yml | 4 +- ansible/playbooks/service/postwhite.yml | 4 +- ansible/playbooks/service/preseed.yml | 6 +- ansible/playbooks/service/proc_hidepid.yml | 2 +- ansible/playbooks/service/prosody.yml | 2 +- ansible/playbooks/service/python.yml | 2 +- ansible/playbooks/service/python_raw.yml | 2 +- .../playbooks/service/rabbitmq_management.yml | 10 +-- ansible/playbooks/service/rabbitmq_server.yml | 6 +- ansible/playbooks/service/radvd.yml | 2 +- ansible/playbooks/service/redis_sentinel.yml | 8 +-- ansible/playbooks/service/redis_server.yml | 12 ++-- ansible/playbooks/service/reprepro.yml | 2 +- ansible/playbooks/service/resources.yml | 2 +- ansible/playbooks/service/root_account.yml | 2 +- ansible/playbooks/service/roundcube.yml | 12 ++-- ansible/playbooks/service/rsnapshot.yml | 2 +- ansible/playbooks/service/rstudio_server.yml | 12 ++-- ansible/playbooks/service/rsyslog.yml | 8 +-- ansible/playbooks/service/ruby.yml | 4 +- ansible/playbooks/service/salt.yml | 6 +- ansible/playbooks/service/samba.yml | 2 +- ansible/playbooks/service/saslauthd.yml | 2 +- ansible/playbooks/service/sftpusers.yml | 4 +- ansible/playbooks/service/sks.yml | 2 +- ansible/playbooks/service/slapd.yml | 4 +- ansible/playbooks/service/smstools.yml | 10 +-- ansible/playbooks/service/snmpd.yml | 6 +- ansible/playbooks/service/sshd.yml | 6 +- ansible/playbooks/service/stunnel.yml | 6 +- ansible/playbooks/service/sudo.yml | 2 +- ansible/playbooks/service/swapfile.yml | 2 +- ansible/playbooks/service/sysctl.yml | 2 +- ansible/playbooks/service/sysfs.yml | 2 +- ansible/playbooks/service/sysnews.yml | 2 +- ansible/playbooks/service/system_groups.yml | 4 +- ansible/playbooks/service/tcpwrappers.yml | 2 +- ansible/playbooks/service/tftpd.yml | 2 +- ansible/playbooks/service/tgt.yml | 2 +- .../service/tinc-persistent_paths.yml | 8 +-- ansible/playbooks/service/tinc-plain.yml | 6 +- .../playbooks/service/unattended_upgrades.yml | 2 +- ansible/playbooks/service/unbound.yml | 6 +- ansible/playbooks/service/users.yml | 2 +- 143 files changed, 355 insertions(+), 350 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 11cacbbacf..caeb13142e 100644 --- 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::`` Ansible tags. You can + use these tags to skip roles without any side-effects; for example + "/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 index 85ffe6ffc8..427837e256 100644 --- 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 index bcc1b9e413..8707883242 100644 --- 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,10 +51,10 @@ - '{{ 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 }}' @@ -62,56 +62,56 @@ - '{{ 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 index 690b3621a9..9d071e2b65 100644 --- 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 index 5a3730c5f3..1d7ed42a34 100644 --- 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 index 99f80d3134..f6c01c11ae 100644 --- 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 index 015c0baf6b..0711b68dfd 100644 --- 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 index db1d27a9a2..53e4039a52 100644 --- 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 index 4758c5e43f..33ab8f31d2 100644 --- 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 index 509a1c278f..c777c4966a 100644 --- 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 index 89c39592af..c80ebb9505 100644 --- 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 index d113c5e227..0e95427492 100644 --- 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 index 905b8b5fc9..77a37c1936 100644 --- 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 index fc9ea3c863..c2ac7fbcb4 100644 --- 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 index 55653c1a1a..ac74adc3a0 100644 --- 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 index 521c76716e..0b52a230cd 100644 --- 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 index 454263c43a..4a7dd9f5a4 100644 --- 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 index f67e40f733..80a0817514 100644 --- 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 index e12f2a15ae..4b1d1bb0ff 100644 --- 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 index cb3f2c8be7..3091326f43 100644 --- 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 index 6861338656..29460d736e 100644 --- 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 index e0a47767d6..ad4d5f85bc 100644 --- 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 index 944ae3c9fe..9e5fcd37ba 100644 --- 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 index f13867c145..b1cee91918 100644 --- 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' ] diff --git a/ansible/playbooks/service/debops_api.yml b/ansible/playbooks/service/debops_api.yml index 84d9640d0d..366ceca9b9 100644 --- a/ansible/playbooks/service/debops_api.yml +++ b/ansible/playbooks/service/debops_api.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx_apt_preferences_dependent_list }}' @@ -21,9 +21,9 @@ - '{{ nginx_ferm_dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ debops_api__nginx__servers }}' - role: debops.debops_api - tags: [ 'role::debops_api' ] + tags: [ 'role::debops_api', 'skip::debops_api' ] diff --git a/ansible/playbooks/service/debops_fact.yml b/ansible/playbooks/service/debops_fact.yml index 549d300324..4e1533b66e 100644 --- a/ansible/playbooks/service/debops_fact.yml +++ b/ansible/playbooks/service/debops_fact.yml @@ -11,4 +11,4 @@ roles: - role: debops.debops_fact - tags: [ 'role::debops_fact' ] + tags: [ 'role::debops_fact', 'skip::debops_fact' ] diff --git a/ansible/playbooks/service/debops_legacy.yml b/ansible/playbooks/service/debops_legacy.yml index b2470702a1..f779750224 100644 --- a/ansible/playbooks/service/debops_legacy.yml +++ b/ansible/playbooks/service/debops_legacy.yml @@ -11,4 +11,4 @@ roles: - role: debops.debops_legacy - tags: [ 'role::debops_legacy' ] + tags: [ 'role::debops_legacy', 'skip::debops_legacy' ] diff --git a/ansible/playbooks/service/dhcpd.yml b/ansible/playbooks/service/dhcpd.yml index 4ea26bb149..a28a510c0d 100644 --- a/ansible/playbooks/service/dhcpd.yml +++ b/ansible/playbooks/service/dhcpd.yml @@ -11,4 +11,4 @@ roles: - role: debops.dhcpd - tags: [ 'role::dhcpd' ] + tags: [ 'role::dhcpd', 'skip::dhcpd' ] diff --git a/ansible/playbooks/service/dhparam.yml b/ansible/playbooks/service/dhparam.yml index 7313bb4e58..f388bc8212 100644 --- a/ansible/playbooks/service/dhparam.yml +++ b/ansible/playbooks/service/dhparam.yml @@ -11,4 +11,4 @@ roles: - role: debops.dhparam - tags: [ 'role::dhparam' ] + tags: [ 'role::dhparam', 'skip::dhparam' ] diff --git a/ansible/playbooks/service/dnsmasq-persistent_paths.yml b/ansible/playbooks/service/dnsmasq-persistent_paths.yml index d8bd26653f..59f2dc5c83 100644 --- a/ansible/playbooks/service/dnsmasq-persistent_paths.yml +++ b/ansible/playbooks/service/dnsmasq-persistent_paths.yml @@ -16,11 +16,11 @@ - '{{ dnsmasq__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] - role: debops.dnsmasq - tags: [ 'role::dnsmasq' ] + tags: [ 'role::dnsmasq', 'skip::dnsmasq' ] - role: debops.persistent_paths - tags: [ 'role::persistent_paths' ] + tags: [ 'role::persistent_paths', 'skip::persistent_paths' ] persistent_paths__dependent_paths: '{{ dnsmasq__persistent_paths__dependent_paths }}' diff --git a/ansible/playbooks/service/dnsmasq-plain.yml b/ansible/playbooks/service/dnsmasq-plain.yml index 24cd1571ab..84363bec8f 100644 --- a/ansible/playbooks/service/dnsmasq-plain.yml +++ b/ansible/playbooks/service/dnsmasq-plain.yml @@ -16,7 +16,7 @@ - '{{ dnsmasq__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] - role: debops.dnsmasq - tags: [ 'role::dnsmasq' ] + tags: [ 'role::dnsmasq', 'skip::dnsmasq' ] diff --git a/ansible/playbooks/service/docker.yml b/ansible/playbooks/service/docker.yml index f1f9b0c566..ec7aa68125 100644 --- a/ansible/playbooks/service/docker.yml +++ b/ansible/playbooks/service/docker.yml @@ -11,7 +11,7 @@ roles: - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ docker__etc_services__dependent_list }}' @@ -21,4 +21,4 @@ - '{{ docker__ferm__dependent_rules }}' - role: debops.docker - tags: [ 'role::docker' ] + tags: [ 'role::docker', 'skip::docker' ] diff --git a/ansible/playbooks/service/docker_gen.yml b/ansible/playbooks/service/docker_gen.yml index a0a8bc67cc..ecc0395b5b 100644 --- a/ansible/playbooks/service/docker_gen.yml +++ b/ansible/playbooks/service/docker_gen.yml @@ -11,4 +11,4 @@ roles: - role: debops.docker_gen - tags: [ 'role::docker_gen' ] + tags: [ 'role::docker_gen', 'skip::docker_gen' ] diff --git a/ansible/playbooks/service/dokuwiki.yml b/ansible/playbooks/service/dokuwiki.yml index 103d4d9224..ecd654a2f4 100644 --- a/ansible/playbooks/service/dokuwiki.yml +++ b/ansible/playbooks/service/dokuwiki.yml @@ -14,18 +14,18 @@ tags: [ 'role::php', 'role::logrotate' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ php__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ dokuwiki__php__dependent_packages }}' php__dependent_pools: @@ -37,11 +37,11 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_upstreams: - '{{ dokuwiki__nginx__dependent_upstreams }}' nginx__dependent_servers: - '{{ dokuwiki__nginx__dependent_servers }}' - role: debops.dokuwiki - tags: [ 'role::dokuwiki' ] + tags: [ 'role::dokuwiki', 'skip::dokuwiki' ] diff --git a/ansible/playbooks/service/dovecot.yml b/ansible/playbooks/service/dovecot.yml index 234cc57597..b28631c0f3 100644 --- a/ansible/playbooks/service/dovecot.yml +++ b/ansible/playbooks/service/dovecot.yml @@ -24,7 +24,7 @@ - '{{ postfix__ferm__dependent_rules }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'dovecot' config: '{{ dovecot__postfix__dependent_maincf }}' @@ -33,4 +33,4 @@ config: '{{ dovecot__postfix__dependent_mastercf }}' - role: debops.dovecot - tags: [ 'role::dovecot' ] + tags: [ 'role::dovecot', 'skip::dovecot' ] diff --git a/ansible/playbooks/service/elastic_co.yml b/ansible/playbooks/service/elastic_co.yml index c630490def..9b40b6cac9 100644 --- a/ansible/playbooks/service/elastic_co.yml +++ b/ansible/playbooks/service/elastic_co.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: - '{{ elastic_co__apt_preferences__dependent_list }}' - role: debops.elastic_co - tags: [ 'role::elastic_co' ] + tags: [ 'role::elastic_co', 'skip::elastic_co' ] diff --git a/ansible/playbooks/service/elasticsearch.yml b/ansible/playbooks/service/elasticsearch.yml index 81c5d0cf84..fd93335621 100644 --- a/ansible/playbooks/service/elasticsearch.yml +++ b/ansible/playbooks/service/elasticsearch.yml @@ -23,13 +23,13 @@ - '{{ elasticsearch__secret__directories }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ java__apt_preferences__dependent_list }}' - '{{ elastic_co__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ elasticsearch__etc_services__dependent_list }}' @@ -39,12 +39,12 @@ - '{{ elasticsearch__ferm__dependent_rules }}' - role: debops.java - tags: [ 'role::java' ] + tags: [ 'role::java', 'skip::java' ] - role: debops.elastic_co - tags: [ 'role::elastic_co' ] + tags: [ 'role::elastic_co', 'skip::elastic_co' ] elastic_co__dependent_packages: - '{{ elasticsearch__elastic_co__dependent_packages }}' - role: debops.elasticsearch - tags: [ 'role::elasticsearch' ] + tags: [ 'role::elasticsearch', 'skip::elasticsearch' ] diff --git a/ansible/playbooks/service/environment.yml b/ansible/playbooks/service/environment.yml index 5adea1fa98..13a2086b79 100644 --- a/ansible/playbooks/service/environment.yml +++ b/ansible/playbooks/service/environment.yml @@ -11,4 +11,4 @@ roles: - role: debops.environment - tags: [ 'role::environment' ] + tags: [ 'role::environment', 'skip::environment' ] diff --git a/ansible/playbooks/service/etc_aliases.yml b/ansible/playbooks/service/etc_aliases.yml index 1d11529551..294f6b3754 100644 --- a/ansible/playbooks/service/etc_aliases.yml +++ b/ansible/playbooks/service/etc_aliases.yml @@ -19,4 +19,4 @@ - '{{ etc_aliases__secret__directories }}' - role: debops.etc_aliases - tags: [ 'role::etc_aliases' ] + tags: [ 'role::etc_aliases', 'skip::etc_aliases' ] diff --git a/ansible/playbooks/service/etc_services.yml b/ansible/playbooks/service/etc_services.yml index a97c78e1bb..6bbbd47495 100644 --- a/ansible/playbooks/service/etc_services.yml +++ b/ansible/playbooks/service/etc_services.yml @@ -11,4 +11,4 @@ roles: - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] diff --git a/ansible/playbooks/service/etckeeper.yml b/ansible/playbooks/service/etckeeper.yml index d4a78fc21d..18238c4d75 100644 --- a/ansible/playbooks/service/etckeeper.yml +++ b/ansible/playbooks/service/etckeeper.yml @@ -11,4 +11,4 @@ roles: - role: debops.etckeeper - tags: [ 'role::etckeeper' ] + tags: [ 'role::etckeeper', 'skip::etckeeper' ] diff --git a/ansible/playbooks/service/etherpad.yml b/ansible/playbooks/service/etherpad.yml index cd7a1b0c90..2290a9b6c6 100644 --- a/ansible/playbooks/service/etherpad.yml +++ b/ansible/playbooks/service/etherpad.yml @@ -11,23 +11,23 @@ roles: - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ etherpad__etc_services__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ etherpad__logrotate__dependent_config }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' - '{{ nodejs__apt_preferences__dependent_list }}' - role: debops.nodejs - tags: [ 'role::nodejs' ] + tags: [ 'role::nodejs', 'skip::nodejs' ] - role: debops.ferm tags: [ 'role::ferm', 'skip::ferm' ] @@ -35,7 +35,7 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_users: - '{{ etherpad__mariadb__dependent_users }}' mariadb__dependent_databases: @@ -43,7 +43,7 @@ when: etherpad__database == 'mysql' - role: debops.postgresql - tags: [ 'role::postgresql' ] + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: - '{{ etherpad__postgresql__dependent_roles }}' postgresql__dependent_groups: @@ -55,11 +55,11 @@ when: etherpad__database == 'postgres' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ etherpad__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ etherpad__nginx__dependent_upstreams }}' - role: debops.etherpad - tags: [ 'role::etherpad' ] + tags: [ 'role::etherpad', 'skip::etherpad' ] diff --git a/ansible/playbooks/service/fail2ban.yml b/ansible/playbooks/service/fail2ban.yml index 410e8d4a3d..fde33e75b3 100644 --- a/ansible/playbooks/service/fail2ban.yml +++ b/ansible/playbooks/service/fail2ban.yml @@ -11,4 +11,4 @@ roles: - role: debops.fail2ban - tags: [ 'role::fail2ban' ] + tags: [ 'role::fail2ban', 'skip::fail2ban' ] diff --git a/ansible/playbooks/service/fcgiwrap.yml b/ansible/playbooks/service/fcgiwrap.yml index 5a17562417..3f1346c8f4 100644 --- a/ansible/playbooks/service/fcgiwrap.yml +++ b/ansible/playbooks/service/fcgiwrap.yml @@ -11,4 +11,4 @@ roles: - role: debops.fcgiwrap - tags: [ 'role::fcgiwrap' ] + tags: [ 'role::fcgiwrap', 'skip::fcgiwrap' ] diff --git a/ansible/playbooks/service/gitlab.yml b/ansible/playbooks/service/gitlab.yml index 208604284e..afbce9b230 100644 --- a/ansible/playbooks/service/gitlab.yml +++ b/ansible/playbooks/service/gitlab.yml @@ -14,10 +14,10 @@ tags: [ 'role::gitlab', 'role::postgresql' ] - role: debops.system_groups - tags: [ 'role::system_groups' ] + tags: [ 'role::system_groups', 'skip::system_groups' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ golang__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' @@ -27,15 +27,15 @@ - '{{ gitlab__apt_preferences__dependent_list }}' - role: debops.golang - tags: [ 'role::golang' ] + tags: [ 'role::golang', 'skip::golang' ] - role: debops.nodejs - tags: [ 'role::nodejs' ] + tags: [ 'role::nodejs', 'skip::nodejs' ] nodejs__upstream: True nodejs__yarn_upstream: True - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ gitlab__etc_services__dependent_list }}' @@ -45,11 +45,11 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.ruby - tags: [ 'role::ruby' ] + tags: [ 'role::ruby', 'skip::ruby' ] ruby__dev_support: True - role: debops.postgresql - tags: [ 'role::postgresql' ] + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: - '{{ gitlab__postgresql__dependent_roles }}' postgresql__dependent_groups: @@ -63,11 +63,11 @@ when: gitlab__database == 'postgresql' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ gitlab__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ gitlab__nginx__dependent_upstreams }}' - role: debops.gitlab - tags: [ 'role::gitlab' ] + tags: [ 'role::gitlab', 'skip::gitlab' ] diff --git a/ansible/playbooks/service/gitlab_runner.yml b/ansible/playbooks/service/gitlab_runner.yml index 6fceaf3ba4..81cf834720 100644 --- a/ansible/playbooks/service/gitlab_runner.yml +++ b/ansible/playbooks/service/gitlab_runner.yml @@ -11,4 +11,4 @@ roles: - role: debops.gitlab_runner - tags: [ 'role::gitlab_runner' ] + tags: [ 'role::gitlab_runner', 'skip::gitlab_runner' ] diff --git a/ansible/playbooks/service/gitusers.yml b/ansible/playbooks/service/gitusers.yml index b5acac7650..cbf35a8c90 100644 --- a/ansible/playbooks/service/gitusers.yml +++ b/ansible/playbooks/service/gitusers.yml @@ -11,10 +11,10 @@ roles: - role: debops.system_groups - tags: [ 'role::system_groups' ] + tags: [ 'role::system_groups', 'skip::system_groups' ] - role: debops.gitusers - tags: [ 'role::gitusers' ] + tags: [ 'role::gitusers', 'skip::gitusers' ] - role: debops.authorized_keys - tags: [ 'role::authorized_keys' ] + tags: [ 'role::authorized_keys', 'skip::authorized_keys' ] diff --git a/ansible/playbooks/service/golang.yml b/ansible/playbooks/service/golang.yml index 6a284addf8..adae46186a 100644 --- a/ansible/playbooks/service/golang.yml +++ b/ansible/playbooks/service/golang.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: - '{{ golang__apt_preferences__dependent_list }}' - role: debops.golang - tags: [ 'role::golang' ] + tags: [ 'role::golang', 'skip::golang' ] diff --git a/ansible/playbooks/service/grub.yml b/ansible/playbooks/service/grub.yml index 72fc072c55..8f03d14949 100644 --- a/ansible/playbooks/service/grub.yml +++ b/ansible/playbooks/service/grub.yml @@ -11,4 +11,4 @@ roles: - role: debops.grub - tags: [ 'role::grub' ] + tags: [ 'role::grub', 'skip::grub' ] diff --git a/ansible/playbooks/service/gunicorn.yml b/ansible/playbooks/service/gunicorn.yml index 7b55220420..bef403b654 100644 --- a/ansible/playbooks/service/gunicorn.yml +++ b/ansible/playbooks/service/gunicorn.yml @@ -11,14 +11,14 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ gunicorn__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ gunicorn__logrotate__dependent_config }}' - role: debops.gunicorn - tags: [ 'role::gunicorn' ] + tags: [ 'role::gunicorn', 'skip::gunicorn' ] diff --git a/ansible/playbooks/service/hashicorp.yml b/ansible/playbooks/service/hashicorp.yml index f9fe09881f..43b08ceade 100644 --- a/ansible/playbooks/service/hashicorp.yml +++ b/ansible/playbooks/service/hashicorp.yml @@ -11,4 +11,4 @@ roles: - role: debops.hashicorp - tags: [ 'role::hashicorp' ] + tags: [ 'role::hashicorp', 'skip::hashicorp' ] diff --git a/ansible/playbooks/service/hwraid.yml b/ansible/playbooks/service/hwraid.yml index a8a5440587..61dcbb43e6 100644 --- a/ansible/playbooks/service/hwraid.yml +++ b/ansible/playbooks/service/hwraid.yml @@ -11,4 +11,4 @@ roles: - role: debops.hwraid - tags: [ 'role::hwraid' ] + tags: [ 'role::hwraid', 'skip::hwraid' ] diff --git a/ansible/playbooks/service/icinga.yml b/ansible/playbooks/service/icinga.yml index 124d153ed8..71bd99f3ff 100644 --- a/ansible/playbooks/service/icinga.yml +++ b/ansible/playbooks/service/icinga.yml @@ -19,12 +19,12 @@ - '{{ icinga__secret__directories | d([]) }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ icinga__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ icinga__etc_services__dependent_list }}' @@ -34,4 +34,4 @@ - '{{ icinga__ferm__dependent_rules }}' - role: debops.icinga - tags: [ 'role::icinga' ] + tags: [ 'role::icinga', 'skip::icinga' ] diff --git a/ansible/playbooks/service/icinga_db.yml b/ansible/playbooks/service/icinga_db.yml index 64c7bc013f..a619a3f758 100644 --- a/ansible/playbooks/service/icinga_db.yml +++ b/ansible/playbooks/service/icinga_db.yml @@ -11,4 +11,4 @@ roles: - role: debops.icinga_db - tags: [ 'role::icinga_db' ] + tags: [ 'role::icinga_db', 'skip::icinga_db' ] diff --git a/ansible/playbooks/service/icinga_web.yml b/ansible/playbooks/service/icinga_web.yml index 3fa0e06d23..466fd9c6ac 100644 --- a/ansible/playbooks/service/icinga_web.yml +++ b/ansible/playbooks/service/icinga_web.yml @@ -14,14 +14,14 @@ tags: [ 'role::php', 'role::logrotate' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ php__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' - '{{ postgresql__apt_preferences__dependent_list | d([]) }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' @@ -31,21 +31,21 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ icinga_web__php__dependent_packages }}' php__dependent_pools: - '{{ icinga_web__php__dependent_pools }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ icinga_web__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ icinga_web__nginx__dependent_upstreams }}' - role: debops.postgresql - tags: [ 'role::postgresql' ] + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: - '{{ icinga_web__postgresql__dependent_roles }}' postgresql__dependent_groups: @@ -57,7 +57,7 @@ when: icinga_web__database_type == 'postgresql' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_databases: - '{{ icinga_web__mariadb__dependent_databases }}' mariadb__dependent_users: @@ -65,4 +65,4 @@ when: icinga_web__database_type == 'mariadb' - role: debops.icinga_web - tags: [ 'role::icinga_web' ] + tags: [ 'role::icinga_web', 'skip::icinga_web' ] diff --git a/ansible/playbooks/service/ifupdown.yml b/ansible/playbooks/service/ifupdown.yml index d2b7d912c1..69d4ba932c 100644 --- a/ansible/playbooks/service/ifupdown.yml +++ b/ansible/playbooks/service/ifupdown.yml @@ -14,7 +14,7 @@ tags: [ 'role::ifupdown', 'role::kmod', 'role::ferm' ] - role: debops.kmod - tags: [ 'role::kmod' ] + tags: [ 'role::kmod', 'skip::kmod' ] kmod__dependent_load: - '{{ ifupdown__env_kmod__dependent_load }}' @@ -24,4 +24,4 @@ - '{{ ifupdown__env_ferm__dependent_rules }}' - role: debops.ifupdown - tags: [ 'role::ifupdown' ] + tags: [ 'role::ifupdown', 'skip::ifupdown' ] diff --git a/ansible/playbooks/service/ipxe.yml b/ansible/playbooks/service/ipxe.yml index 15ab72bc5d..ad6736e7bf 100644 --- a/ansible/playbooks/service/ipxe.yml +++ b/ansible/playbooks/service/ipxe.yml @@ -11,4 +11,4 @@ roles: - role: debops.ipxe - tags: [ 'role::ipxe' ] + tags: [ 'role::ipxe', 'skip::ipxe' ] diff --git a/ansible/playbooks/service/iscsi.yml b/ansible/playbooks/service/iscsi.yml index 30374846bc..2db14fcf99 100644 --- a/ansible/playbooks/service/iscsi.yml +++ b/ansible/playbooks/service/iscsi.yml @@ -11,11 +11,11 @@ roles: - role: debops.unattended_upgrades - tags: [ 'role::unattended_upgrades' ] + tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ] unattended_upgrades__dependent_blacklist: '{{ iscsi__unattended_upgrades__dependent_blacklist }}' - role: debops.lvm - tags: [ 'role::lvm' ] + tags: [ 'role::lvm', 'skip::lvm' ] - role: debops.iscsi - tags: [ 'role::iscsi' ] + tags: [ 'role::iscsi', 'skip::iscsi' ] diff --git a/ansible/playbooks/service/java.yml b/ansible/playbooks/service/java.yml index ac54ca3d4e..806049c875 100644 --- a/ansible/playbooks/service/java.yml +++ b/ansible/playbooks/service/java.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: - '{{ java__apt_preferences__dependent_list }}' - role: debops.java - tags: [ 'role::java' ] + tags: [ 'role::java', 'skip::java' ] diff --git a/ansible/playbooks/service/kibana.yml b/ansible/playbooks/service/kibana.yml index e6dd14225a..4d33045328 100644 --- a/ansible/playbooks/service/kibana.yml +++ b/ansible/playbooks/service/kibana.yml @@ -19,13 +19,13 @@ - '{{ kibana__secret__directories }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ elastic_co__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ kibana__etc_services__dependent_list }}' @@ -35,16 +35,16 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ kibana__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ kibana__nginx__dependent_upstreams }}' - role: debops.elastic_co - tags: [ 'role::elastic_co' ] + tags: [ 'role::elastic_co', 'skip::elastic_co' ] elastic_co__dependent_packages: - '{{ kibana__elastic_co__dependent_packages }}' - role: debops.kibana - tags: [ 'role::kibana' ] + tags: [ 'role::kibana', 'skip::kibana' ] diff --git a/ansible/playbooks/service/kmod.yml b/ansible/playbooks/service/kmod.yml index de854ac264..4aeb6ba87a 100644 --- a/ansible/playbooks/service/kmod.yml +++ b/ansible/playbooks/service/kmod.yml @@ -11,4 +11,4 @@ roles: - role: debops.kmod - tags: [ 'role::kmod' ] + tags: [ 'role::kmod', 'skip::kmod' ] diff --git a/ansible/playbooks/service/librenms.yml b/ansible/playbooks/service/librenms.yml index a90b50cb8b..0f06646013 100644 --- a/ansible/playbooks/service/librenms.yml +++ b/ansible/playbooks/service/librenms.yml @@ -14,13 +14,13 @@ tags: [ 'role::php', 'role::logrotate' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ php__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' - '{{ librenms__logrotate__dependent_config }}' @@ -31,23 +31,23 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ librenms__php__dependent_packages }}' php__dependent_pools: - '{{ librenms__php__dependent_pools }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ librenms__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ librenms__nginx__dependent_upstreams }}' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_users: - '{{ librenms__mariadb__dependent_users }}' - role: debops.librenms - tags: [ 'role::librenms' ] + tags: [ 'role::librenms', 'skip::librenms' ] diff --git a/ansible/playbooks/service/libvirt.yml b/ansible/playbooks/service/libvirt.yml index 4524ab3532..81fce380c9 100644 --- a/ansible/playbooks/service/libvirt.yml +++ b/ansible/playbooks/service/libvirt.yml @@ -11,4 +11,4 @@ roles: - role: debops.libvirt - tags: [ 'role::libvirt' ] + tags: [ 'role::libvirt', 'skip::libvirt' ] diff --git a/ansible/playbooks/service/libvirtd.yml b/ansible/playbooks/service/libvirtd.yml index 99cc69f622..6d18b42e30 100644 --- a/ansible/playbooks/service/libvirtd.yml +++ b/ansible/playbooks/service/libvirtd.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ libvirtd__apt_preferences__dependent_list }}' @@ -24,7 +24,7 @@ - '{{ libvirtd_qemu__ferm__dependent_rules }}' - role: debops.libvirtd - tags: [ 'role::libvirtd' ] + tags: [ 'role::libvirtd', 'skip::libvirtd' ] - role: debops.libvirtd_qemu - tags: [ 'role::libvirtd_qemu', 'role::libvirtd' ] + tags: [ 'role::libvirtd_qemu', 'skip::libvirtd_qemu', 'role::libvirtd', 'skip::libvirtd' ] diff --git a/ansible/playbooks/service/libvirtd_qemu.yml b/ansible/playbooks/service/libvirtd_qemu.yml index ad606ef0bc..1fa782b34d 100644 --- a/ansible/playbooks/service/libvirtd_qemu.yml +++ b/ansible/playbooks/service/libvirtd_qemu.yml @@ -16,4 +16,4 @@ - '{{ libvirtd_qemu__ferm__dependent_rules }}' - role: debops.libvirtd_qemu - tags: [ 'role::libvirtd_qemu' ] + tags: [ 'role::libvirtd_qemu', 'skip::libvirtd_qemu' ] diff --git a/ansible/playbooks/service/locales.yml b/ansible/playbooks/service/locales.yml index 9a21cd5aee..7a49c2491c 100644 --- a/ansible/playbooks/service/locales.yml +++ b/ansible/playbooks/service/locales.yml @@ -11,4 +11,4 @@ roles: - role: debops.locales - tags: [ 'role::locales' ] + tags: [ 'role::locales', 'skip::locales' ] diff --git a/ansible/playbooks/service/logrotate.yml b/ansible/playbooks/service/logrotate.yml index 4d159d2f71..f54f7e0bb7 100644 --- a/ansible/playbooks/service/logrotate.yml +++ b/ansible/playbooks/service/logrotate.yml @@ -11,4 +11,4 @@ roles: - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] diff --git a/ansible/playbooks/service/lvm.yml b/ansible/playbooks/service/lvm.yml index 2ed428b3b3..84a980590e 100644 --- a/ansible/playbooks/service/lvm.yml +++ b/ansible/playbooks/service/lvm.yml @@ -11,4 +11,4 @@ roles: - role: debops.lvm - tags: [ 'role::lvm' ] + tags: [ 'role::lvm', 'skip::lvm' ] diff --git a/ansible/playbooks/service/lxc.yml b/ansible/playbooks/service/lxc.yml index 3dd9007862..0fd515b0bb 100644 --- a/ansible/playbooks/service/lxc.yml +++ b/ansible/playbooks/service/lxc.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ lxc__apt_preferences__dependent_list }}' @@ -23,4 +23,4 @@ - '{{ lxc__ferm__dependent_rules }}' - role: debops.lxc - tags: [ 'role::lxc' ] + tags: [ 'role::lxc', 'skip::lxc' ] diff --git a/ansible/playbooks/service/machine.yml b/ansible/playbooks/service/machine.yml index c4df187747..70e6f22e9a 100644 --- a/ansible/playbooks/service/machine.yml +++ b/ansible/playbooks/service/machine.yml @@ -11,4 +11,4 @@ roles: - role: debops.machine - tags: [ 'role::machine' ] + tags: [ 'role::machine', 'skip::machine' ] diff --git a/ansible/playbooks/service/mailman.yml b/ansible/playbooks/service/mailman.yml index 9e8e53c051..e0a1165930 100644 --- a/ansible/playbooks/service/mailman.yml +++ b/ansible/playbooks/service/mailman.yml @@ -19,16 +19,16 @@ - '{{ postfix__secret__directories }}' - role: debops.fcgiwrap - tags: [ 'role::fcgiwrap' ] + tags: [ 'role::fcgiwrap', 'skip::fcgiwrap' ] fcgiwrap__instances: - '{{ mailman__fcgiwrap__instance }}' - role: debops.unattended_upgrades - tags: [ 'role::unattended_upgrades' ] + tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ] unattended_upgrades__dependent_blacklist: '{{ mailman__unattended_upgrades__dependent_blacklist }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ mailman__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' @@ -40,14 +40,14 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'mailman' config: '{{ mailman__postfix__dependent_maincf }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__servers: '{{ mailman__nginx__servers }}' - role: debops.mailman - tags: [ 'role::mailman' ] + tags: [ 'role::mailman', 'skip::mailman' ] diff --git a/ansible/playbooks/service/mariadb.yml b/ansible/playbooks/service/mariadb.yml index 6cf47a5c5a..65846a7067 100644 --- a/ansible/playbooks/service/mariadb.yml +++ b/ansible/playbooks/service/mariadb.yml @@ -11,4 +11,4 @@ roles: - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] diff --git a/ansible/playbooks/service/mariadb_server.yml b/ansible/playbooks/service/mariadb_server.yml index 9a1720bd62..7d90c9b6d1 100644 --- a/ansible/playbooks/service/mariadb_server.yml +++ b/ansible/playbooks/service/mariadb_server.yml @@ -16,9 +16,9 @@ - '{{ mariadb_server__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ mariadb_server__tcpwrappers__dependent_allow }}' - role: debops.mariadb_server - tags: [ 'role::mariadb_server' ] + tags: [ 'role::mariadb_server', 'skip::mariadb_server' ] diff --git a/ansible/playbooks/service/memcached.yml b/ansible/playbooks/service/memcached.yml index 0ee3d5ea34..ca878dfc6c 100644 --- a/ansible/playbooks/service/memcached.yml +++ b/ansible/playbooks/service/memcached.yml @@ -11,4 +11,4 @@ roles: - role: debops.memcached - tags: [ 'role::memcached' ] + tags: [ 'role::memcached', 'skip::memcached' ] diff --git a/ansible/playbooks/service/monit.yml b/ansible/playbooks/service/monit.yml index 1d17664a82..8440cc542f 100644 --- a/ansible/playbooks/service/monit.yml +++ b/ansible/playbooks/service/monit.yml @@ -11,4 +11,4 @@ roles: - role: debops.monit - tags: [ 'role::monit' ] + tags: [ 'role::monit', 'skip::monit' ] diff --git a/ansible/playbooks/service/mosquitto-nginx.yml b/ansible/playbooks/service/mosquitto-nginx.yml index 5f8d30c243..8aaeeb8542 100644 --- a/ansible/playbooks/service/mosquitto-nginx.yml +++ b/ansible/playbooks/service/mosquitto-nginx.yml @@ -11,17 +11,17 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ mosquitto__etc_services__dependent_list }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ mosquitto__tcpwrappers__dependent_allow }}' @@ -32,11 +32,11 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ mosquitto__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ mosquitto__nginx__dependent_upstreams }}' - role: debops.mosquitto - tags: [ 'role::mosquitto' ] + tags: [ 'role::mosquitto', 'skip::mosquitto' ] diff --git a/ansible/playbooks/service/mosquitto-plain.yml b/ansible/playbooks/service/mosquitto-plain.yml index 7db671442b..cfb34e460f 100644 --- a/ansible/playbooks/service/mosquitto-plain.yml +++ b/ansible/playbooks/service/mosquitto-plain.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: - '{{ mosquitto__etc_services__dependent_list }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ mosquitto__tcpwrappers__dependent_allow }}' @@ -26,4 +26,4 @@ - '{{ mosquitto__ferm__dependent_rules }}' - role: debops.mosquitto - tags: [ 'role::mosquitto' ] + tags: [ 'role::mosquitto', 'skip::mosquitto' ] diff --git a/ansible/playbooks/service/netbase.yml b/ansible/playbooks/service/netbase.yml index 378c0c11f7..4135db6276 100644 --- a/ansible/playbooks/service/netbase.yml +++ b/ansible/playbooks/service/netbase.yml @@ -11,4 +11,4 @@ roles: - role: debops.netbase - tags: [ 'role::netbase' ] + tags: [ 'role::netbase', 'skip::netbase' ] diff --git a/ansible/playbooks/service/netbox.yml b/ansible/playbooks/service/netbox.yml index b6039dd6e4..d76a7495c7 100644 --- a/ansible/playbooks/service/netbox.yml +++ b/ansible/playbooks/service/netbox.yml @@ -11,14 +11,14 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ gunicorn__apt_preferences__dependent_list }}' - '{{ postgresql__apt_preferences__dependent_list }}' - '{{ nginx__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ gunicorn__logrotate__dependent_config }}' @@ -28,7 +28,7 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.postgresql - tags: [ 'role::postgresql' ] + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: - '{{ netbox__postgresql__dependent_roles }}' postgresql__dependent_groups: @@ -39,16 +39,16 @@ - '{{ netbox__postgresql__dependent_pgpass }}' - role: debops.gunicorn - tags: [ 'role::gunicorn' ] + tags: [ 'role::gunicorn', 'skip::gunicorn' ] gunicorn__dependent_applications: - '{{ netbox__gunicorn__dependent_applications }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_upstreams: - '{{ netbox__nginx__dependent_upstreams }}' nginx__dependent_servers: - '{{ netbox__nginx__dependent_servers }}' - role: debops.netbox - tags: [ 'role::netbox' ] + tags: [ 'role::netbox', 'skip::netbox' ] diff --git a/ansible/playbooks/service/nfs.yml b/ansible/playbooks/service/nfs.yml index bb20286b5e..1d637b1598 100644 --- a/ansible/playbooks/service/nfs.yml +++ b/ansible/playbooks/service/nfs.yml @@ -11,4 +11,4 @@ roles: - role: debops.nfs - tags: [ 'role::nfs' ] + tags: [ 'role::nfs', 'skip::nfs' ] diff --git a/ansible/playbooks/service/nfs_server.yml b/ansible/playbooks/service/nfs_server.yml index 1f6676cfe7..b76b4dca63 100644 --- a/ansible/playbooks/service/nfs_server.yml +++ b/ansible/playbooks/service/nfs_server.yml @@ -11,7 +11,7 @@ roles: - role: debops.etc_services - tags: [ 'role::etc_services', 'role::ferm' ] + tags: [ 'role::etc_services', 'skip::etc_services', 'role::ferm' ] etc_services__dependent_list: - '{{ nfs_server__etc_services__dependent_list }}' @@ -21,9 +21,9 @@ - '{{ nfs_server__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ nfs_server__tcpwrappers__dependent_allow }}' - role: debops.nfs_server - tags: [ 'role::nfs_server' ] + tags: [ 'role::nfs_server', 'skip::nfs_server' ] diff --git a/ansible/playbooks/service/nginx.yml b/ansible/playbooks/service/nginx.yml index 49fc69f2cc..ef7075967a 100644 --- a/ansible/playbooks/service/nginx.yml +++ b/ansible/playbooks/service/nginx.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' @@ -21,4 +21,4 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] diff --git a/ansible/playbooks/service/nodejs.yml b/ansible/playbooks/service/nodejs.yml index 0b492dcc3b..b2c81e804b 100644 --- a/ansible/playbooks/service/nodejs.yml +++ b/ansible/playbooks/service/nodejs.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: - '{{ nodejs__apt_preferences__dependent_list }}' - role: debops.nodejs - tags: [ 'role::nodejs' ] + tags: [ 'role::nodejs', 'skip::nodejs' ] diff --git a/ansible/playbooks/service/nsswitch.yml b/ansible/playbooks/service/nsswitch.yml index d3f01d5298..edd66b5860 100644 --- a/ansible/playbooks/service/nsswitch.yml +++ b/ansible/playbooks/service/nsswitch.yml @@ -11,4 +11,4 @@ roles: - role: debops.nsswitch - tags: [ 'role::nsswitch' ] + tags: [ 'role::nsswitch', 'skip::nsswitch' ] diff --git a/ansible/playbooks/service/ntp.yml b/ansible/playbooks/service/ntp.yml index c8499c358a..20c144a1e0 100644 --- a/ansible/playbooks/service/ntp.yml +++ b/ansible/playbooks/service/ntp.yml @@ -16,4 +16,4 @@ - '{{ ntp__ferm__dependent_rules }}' - role: debops.ntp - tags: [ 'role::ntp' ] + tags: [ 'role::ntp', 'skip::ntp' ] diff --git a/ansible/playbooks/service/nullmailer.yml b/ansible/playbooks/service/nullmailer.yml index 0000de0e4d..ae502cb0a1 100644 --- a/ansible/playbooks/service/nullmailer.yml +++ b/ansible/playbooks/service/nullmailer.yml @@ -19,9 +19,9 @@ - '{{ nullmailer__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ nullmailer__tcpwrappers__dependent_allow }}' - role: debops.nullmailer - tags: [ 'role::nullmailer' ] + tags: [ 'role::nullmailer', 'skip::nullmailer' ] diff --git a/ansible/playbooks/service/opendkim.yml b/ansible/playbooks/service/opendkim.yml index 68b56e2526..43b64e7519 100644 --- a/ansible/playbooks/service/opendkim.yml +++ b/ansible/playbooks/service/opendkim.yml @@ -24,11 +24,11 @@ - '{{ opendkim__secret__directories | d([]) }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'opendkim' config: '{{ opendkim__postfix__dependent_maincf }}' when: opendkim__postfix_integration|bool - role: debops.opendkim - tags: [ 'role::opendkim' ] + tags: [ 'role::opendkim', 'skip::opendkim' ] diff --git a/ansible/playbooks/service/openvz.yml b/ansible/playbooks/service/openvz.yml index aa8ddb989b..0482465b46 100644 --- a/ansible/playbooks/service/openvz.yml +++ b/ansible/playbooks/service/openvz.yml @@ -11,4 +11,4 @@ roles: - role: debops.openvz - tags: [ 'role::openvz' ] + tags: [ 'role::openvz', 'skip::openvz' ] diff --git a/ansible/playbooks/service/owncloud-apache.yml b/ansible/playbooks/service/owncloud-apache.yml index 44cb0e98d2..45c6e99218 100644 --- a/ansible/playbooks/service/owncloud-apache.yml +++ b/ansible/playbooks/service/owncloud-apache.yml @@ -20,7 +20,7 @@ tags: [ 'role::owncloud', 'role::owncloud:env' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ owncloud__apt_preferences__dependent_list }}' - '{{ php__apt_preferences__dependent_list }}' @@ -31,23 +31,23 @@ - '{{ apache__ferm__dependent_rules }}' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_users: '{{ owncloud__mariadb__dependent_users }}' when: (owncloud__database == 'mariadb') - role: debops.postgresql + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: '{{ owncloud__postgresql__dependent_roles }}' postgresql__dependent_groups: '{{ owncloud__postgresql__dependent_groups }}' postgresql__dependent_databases: '{{ owncloud__postgresql__dependent_databases }}' when: (owncloud__database == 'postgresql') - tags: [ 'role::postgresql' ] - role: debops.unattended_upgrades - tags: [ 'role::unattended_upgrades' ] + tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ] unattended_upgrades__dependent_origins: '{{ owncloud__unattended_upgrades__dependent_origins }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ owncloud__php__dependent_packages }}' php__dependent_configuration: @@ -56,16 +56,16 @@ - '{{ owncloud__php__dependent_pools }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' - '{{ owncloud__logrotate__dependent_config }}' - role: debops.apache - tags: [ 'role::apache' ] + tags: [ 'role::apache', 'skip::apache' ] apache__dependent_snippets: '{{ owncloud__apache__dependent_snippets }}' apache__dependent_vhosts: - '{{ owncloud__apache__dependent_vhosts }}' - role: debops.owncloud - tags: [ 'role::owncloud' ] + tags: [ 'role::owncloud', 'skip::owncloud' ] diff --git a/ansible/playbooks/service/owncloud-nginx.yml b/ansible/playbooks/service/owncloud-nginx.yml index b8f7df4593..c5a8f6687d 100644 --- a/ansible/playbooks/service/owncloud-nginx.yml +++ b/ansible/playbooks/service/owncloud-nginx.yml @@ -17,7 +17,7 @@ tags: [ 'role::owncloud', 'role::owncloud:env', 'role::nginx' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences', 'role::nginx', 'role::php' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences', 'role::nginx', 'role::php' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' - '{{ owncloud__apt_preferences__dependent_list }}' @@ -29,24 +29,24 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_databases: '{{ owncloud__mariadb__dependent_databases }}' mariadb__dependent_users: '{{ owncloud__mariadb__dependent_users }}' when: (owncloud__database == 'mariadb') - role: debops.postgresql + tags: [ 'role::postgresql', 'skip::postgresql' ] postgresql__dependent_roles: '{{ owncloud__postgresql__dependent_roles }}' postgresql__dependent_groups: '{{ owncloud__postgresql__dependent_groups }}' postgresql__dependent_databases: '{{ owncloud__postgresql__dependent_databases }}' when: (owncloud__database == 'postgresql') - tags: [ 'role::postgresql' ] - role: debops.unattended_upgrades - tags: [ 'role::unattended_upgrades' ] + tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ] unattended_upgrades__dependent_origins: '{{ owncloud__unattended_upgrades__dependent_origins }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ owncloud__php__dependent_packages }}' php__dependent_configuration: @@ -55,17 +55,17 @@ - '{{ owncloud__php__dependent_pools }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' - '{{ owncloud__logrotate__dependent_config }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ owncloud__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ owncloud__nginx__dependent_upstreams }}' - role: debops.owncloud - tags: [ 'role::owncloud' ] + tags: [ 'role::owncloud', 'skip::owncloud' ] diff --git a/ansible/playbooks/service/persistent_paths.yml b/ansible/playbooks/service/persistent_paths.yml index e942831911..05ab06dc77 100644 --- a/ansible/playbooks/service/persistent_paths.yml +++ b/ansible/playbooks/service/persistent_paths.yml @@ -11,4 +11,4 @@ roles: - role: debops.persistent_paths - tags: [ 'role::persistent_paths' ] + tags: [ 'role::persistent_paths', 'skip::persistent_paths' ] diff --git a/ansible/playbooks/service/php.yml b/ansible/playbooks/service/php.yml index dcd946d7db..810023be22 100644 --- a/ansible/playbooks/service/php.yml +++ b/ansible/playbooks/service/php.yml @@ -14,14 +14,14 @@ tags: [ 'role::php', 'role::logrotate' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ php__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] diff --git a/ansible/playbooks/service/phpipam.yml b/ansible/playbooks/service/phpipam.yml index 2dc2688d42..738eb7352d 100644 --- a/ansible/playbooks/service/phpipam.yml +++ b/ansible/playbooks/service/phpipam.yml @@ -11,4 +11,4 @@ roles: - role: debops.phpipam - tags: [ 'role::phpipam' ] + tags: [ 'role::phpipam', 'skip::phpipam' ] diff --git a/ansible/playbooks/service/phpmyadmin.yml b/ansible/playbooks/service/phpmyadmin.yml index 0199c6b34c..7d32045ca7 100644 --- a/ansible/playbooks/service/phpmyadmin.yml +++ b/ansible/playbooks/service/phpmyadmin.yml @@ -11,4 +11,4 @@ roles: - role: debops.phpmyadmin - tags: [ 'role::phpmyadmin' ] + tags: [ 'role::phpmyadmin', 'skip::phpmyadmin' ] diff --git a/ansible/playbooks/service/pki.yml b/ansible/playbooks/service/pki.yml index bd05dae3ef..ee8469e6bb 100644 --- a/ansible/playbooks/service/pki.yml +++ b/ansible/playbooks/service/pki.yml @@ -19,4 +19,4 @@ - '{{ pki_env_secret_directories }}' - role: debops.pki - tags: [ 'role::pki' ] + tags: [ 'role::pki', 'skip::pki' ] diff --git a/ansible/playbooks/service/postconf.yml b/ansible/playbooks/service/postconf.yml index 077ec93435..6b5eee50ed 100644 --- a/ansible/playbooks/service/postconf.yml +++ b/ansible/playbooks/service/postconf.yml @@ -30,7 +30,7 @@ - '{{ postfix__ferm__dependent_rules }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'postconf' config: '{{ postconf__postfix__dependent_maincf }}' @@ -41,4 +41,4 @@ - '{{ postconf__postfix__dependent_lookup_tables }}' - role: debops.postconf - tags: [ 'role::postconf' ] + tags: [ 'role::postconf', 'skip::postconf' ] diff --git a/ansible/playbooks/service/postfix.yml b/ansible/playbooks/service/postfix.yml index ed7d0457e1..c4c454b582 100644 --- a/ansible/playbooks/service/postfix.yml +++ b/ansible/playbooks/service/postfix.yml @@ -28,7 +28,7 @@ - '{{ postfix__ferm__dependent_rules }}' - role: debops.etc_aliases - tags: [ 'role::etc_aliases' ] + tags: [ 'role::etc_aliases', 'skip::etc_aliases' ] - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] diff --git a/ansible/playbooks/service/postgresql.yml b/ansible/playbooks/service/postgresql.yml index da2edaac22..5dbf86faa0 100644 --- a/ansible/playbooks/service/postgresql.yml +++ b/ansible/playbooks/service/postgresql.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: - '{{ postgresql__apt_preferences__dependent_list }}' - role: debops.postgresql - tags: [ 'role::postgresql' ] + tags: [ 'role::postgresql', 'skip::postgresql' ] diff --git a/ansible/playbooks/service/postgresql_server.yml b/ansible/playbooks/service/postgresql_server.yml index 9e5dcbf6b6..cb65bb8244 100644 --- a/ansible/playbooks/service/postgresql_server.yml +++ b/ansible/playbooks/service/postgresql_server.yml @@ -11,12 +11,12 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ postgresql_server__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ postgresql_server__etc_services__dependent_list }}' @@ -26,9 +26,9 @@ - '{{ postgresql_server__ferm__dependent_rules }}' - role: debops.locales - tags: [ 'role::locales' ] + tags: [ 'role::locales', 'skip::locales' ] locales__dependent_list: - '{{ postgresql_server__locales__dependent_list }}' - role: debops.postgresql_server - tags: [ 'role::postgresql_server' ] + tags: [ 'role::postgresql_server', 'skip::postgresql_server' ] diff --git a/ansible/playbooks/service/postscreen.yml b/ansible/playbooks/service/postscreen.yml index 656677d183..40df345048 100644 --- a/ansible/playbooks/service/postscreen.yml +++ b/ansible/playbooks/service/postscreen.yml @@ -19,7 +19,7 @@ - '{{ postfix__secret__directories }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_packages: - '{{ postscreen__postfix__dependent_packages }}' postfix__dependent_maincf: @@ -30,4 +30,4 @@ config: '{{ postscreen__postfix__dependent_mastercf }}' - role: debops.postscreen - tags: [ 'role::postscreen' ] + tags: [ 'role::postscreen', 'skip::postscreen' ] diff --git a/ansible/playbooks/service/postwhite.yml b/ansible/playbooks/service/postwhite.yml index 882ad66494..8c380e8674 100644 --- a/ansible/playbooks/service/postwhite.yml +++ b/ansible/playbooks/service/postwhite.yml @@ -23,7 +23,7 @@ (ansible_local.postfix.installed|d())|bool) - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'postwhite' config: '{{ postwhite__postfix__dependent_maincf }}' @@ -31,4 +31,4 @@ (ansible_local.postfix.installed|d())|bool) - role: debops.postwhite - tags: [ 'role::postwhite' ] + tags: [ 'role::postwhite', 'skip::postwhite' ] diff --git a/ansible/playbooks/service/preseed.yml b/ansible/playbooks/service/preseed.yml index 3de2ac90cb..56f00fac2e 100644 --- a/ansible/playbooks/service/preseed.yml +++ b/ansible/playbooks/service/preseed.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx_apt_preferences_dependent_list }}' @@ -21,8 +21,8 @@ - '{{ nginx_ferm_dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx_servers: '{{ preseed__nginx__servers }}' - role: debops.preseed - tags: [ 'role::preseed' ] + tags: [ 'role::preseed', 'skip::preseed' ] diff --git a/ansible/playbooks/service/proc_hidepid.yml b/ansible/playbooks/service/proc_hidepid.yml index 8732d49087..e59315d803 100644 --- a/ansible/playbooks/service/proc_hidepid.yml +++ b/ansible/playbooks/service/proc_hidepid.yml @@ -11,4 +11,4 @@ roles: - role: debops.proc_hidepid - tags: [ 'role::proc_hidepid' ] + tags: [ 'role::proc_hidepid', 'skip::proc_hidepid' ] diff --git a/ansible/playbooks/service/prosody.yml b/ansible/playbooks/service/prosody.yml index a5b807a9f6..13cdcb759f 100644 --- a/ansible/playbooks/service/prosody.yml +++ b/ansible/playbooks/service/prosody.yml @@ -16,4 +16,4 @@ - '{{ prosody__ferm__dependent_rules }}' - role: debops.prosody - tags: [ 'role::prosody' ] + tags: [ 'role::prosody', 'skip::prosody' ] diff --git a/ansible/playbooks/service/python.yml b/ansible/playbooks/service/python.yml index 6b893b659e..1ab649cdaf 100644 --- a/ansible/playbooks/service/python.yml +++ b/ansible/playbooks/service/python.yml @@ -11,4 +11,4 @@ roles: - role: debops.python - tags: [ 'role::python' ] + tags: [ 'role::python', 'skip::python' ] diff --git a/ansible/playbooks/service/python_raw.yml b/ansible/playbooks/service/python_raw.yml index d287ed12e3..cbd1b45b6f 100644 --- a/ansible/playbooks/service/python_raw.yml +++ b/ansible/playbooks/service/python_raw.yml @@ -8,4 +8,4 @@ roles: - role: debops.python/raw - tags: [ 'role::python_raw' ] + tags: [ 'role::python_raw', 'skip::python_raw' ] diff --git a/ansible/playbooks/service/rabbitmq_management.yml b/ansible/playbooks/service/rabbitmq_management.yml index 7b64b94689..e1e59d8d00 100644 --- a/ansible/playbooks/service/rabbitmq_management.yml +++ b/ansible/playbooks/service/rabbitmq_management.yml @@ -21,13 +21,13 @@ when: rabbitmq_management__local|bool - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ rabbitmq_management__etc_services__dependent_list }}' when: rabbitmq_management__local|bool - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' @@ -37,14 +37,14 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ rabbitmq_management__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ rabbitmq_management__nginx__dependent_upstreams }}' - role: debops.rabbitmq_server - tags: [ 'role::rabbitmq_server' ] + tags: [ 'role::rabbitmq_server', 'skip::rabbitmq_server' ] rabbitmq_server__dependent_role: 'rabbitmq_management' rabbitmq_server__dependent_state: '{{ rabbitmq_management__deploy_state }}' rabbitmq_server__dependent_config: @@ -52,4 +52,4 @@ when: rabbitmq_management__local|bool - role: debops.rabbitmq_management - tags: [ 'role::rabbitmq_management' ] + tags: [ 'role::rabbitmq_management', 'skip::rabbitmq_management' ] diff --git a/ansible/playbooks/service/rabbitmq_server.yml b/ansible/playbooks/service/rabbitmq_server.yml index d1e997badd..7ea4217845 100644 --- a/ansible/playbooks/service/rabbitmq_server.yml +++ b/ansible/playbooks/service/rabbitmq_server.yml @@ -19,12 +19,12 @@ - '{{ rabbitmq_server__secret__directories }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ rabbitmq_server__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ rabbitmq_server__etc_services__dependent_list }}' @@ -34,4 +34,4 @@ - '{{ rabbitmq_server__ferm__dependent_rules }}' - role: debops.rabbitmq_server - tags: [ 'role::rabbitmq_server' ] + tags: [ 'role::rabbitmq_server', 'skip::rabbitmq_server' ] diff --git a/ansible/playbooks/service/radvd.yml b/ansible/playbooks/service/radvd.yml index cb1de9e7f7..6e0552321d 100644 --- a/ansible/playbooks/service/radvd.yml +++ b/ansible/playbooks/service/radvd.yml @@ -11,4 +11,4 @@ roles: - role: debops.radvd - tags: [ 'role::radvd' ] + tags: [ 'role::radvd', 'skip::radvd' ] diff --git a/ansible/playbooks/service/redis_sentinel.yml b/ansible/playbooks/service/redis_sentinel.yml index 10cec5035f..929a475d7c 100644 --- a/ansible/playbooks/service/redis_sentinel.yml +++ b/ansible/playbooks/service/redis_sentinel.yml @@ -14,12 +14,12 @@ tags: [ 'role::redis_sentinel', 'role::ferm' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ redis_sentinel__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ redis_sentinel__etc_services__dependent_list }}' @@ -29,11 +29,11 @@ - '{{ redis_sentinel__ferm__dependent_rules }}' - role: debops.python - tags: [ 'role::python', 'role::redis_sentinel' ] + tags: [ 'role::python', 'skip::python', 'role::redis_sentinel' ] python__dependent_packages3: - '{{ redis_sentinel__python__dependent_packages3 }}' python__dependent_packages2: - '{{ redis_sentinel__python__dependent_packages2 }}' - role: debops.redis_sentinel - tags: [ 'role::redis_sentinel' ] + tags: [ 'role::redis_sentinel', 'skip::redis_sentinel' ] diff --git a/ansible/playbooks/service/redis_server.yml b/ansible/playbooks/service/redis_server.yml index 3b57649b1d..b348b4d566 100644 --- a/ansible/playbooks/service/redis_server.yml +++ b/ansible/playbooks/service/redis_server.yml @@ -22,12 +22,12 @@ - '{{ sysfs__secret__directories | d([]) }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ redis_server__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ redis_server__etc_services__dependent_list }}' @@ -37,21 +37,21 @@ - '{{ redis_server__ferm__dependent_rules }}' - role: debops.sysctl - tags: [ 'role::sysctl' ] + tags: [ 'role::sysctl', 'skip::sysctl' ] sysctl__dependent_parameters: - '{{ redis_server__sysctl__dependent_parameters }}' - role: debops.sysfs - tags: [ 'role::sysfs' ] + tags: [ 'role::sysfs', 'skip::sysfs' ] sysfs__dependent_attributes: - '{{ redis_server__sysfs__dependent_attributes }}' - role: debops.python - tags: [ 'role::python', 'role::redis_server' ] + tags: [ 'role::python', 'skip::python', 'role::redis_server' ] python__dependent_packages3: - '{{ redis_server__python__dependent_packages3 }}' python__dependent_packages2: - '{{ redis_server__python__dependent_packages2 }}' - role: debops.redis_server - tags: [ 'role::redis_server' ] + tags: [ 'role::redis_server', 'skip::redis_server' ] diff --git a/ansible/playbooks/service/reprepro.yml b/ansible/playbooks/service/reprepro.yml index 752b4771b9..11a6d8b291 100644 --- a/ansible/playbooks/service/reprepro.yml +++ b/ansible/playbooks/service/reprepro.yml @@ -11,4 +11,4 @@ roles: - role: debops.reprepro - tags: [ 'role::reprepro' ] + tags: [ 'role::reprepro', 'skip::reprepro' ] diff --git a/ansible/playbooks/service/resources.yml b/ansible/playbooks/service/resources.yml index b09300b20a..6ef223370f 100644 --- a/ansible/playbooks/service/resources.yml +++ b/ansible/playbooks/service/resources.yml @@ -11,4 +11,4 @@ roles: - role: debops.resources - tags: [ 'role::resources' ] + tags: [ 'role::resources', 'skip::resources' ] diff --git a/ansible/playbooks/service/root_account.yml b/ansible/playbooks/service/root_account.yml index 767244c477..e2567e4f9c 100644 --- a/ansible/playbooks/service/root_account.yml +++ b/ansible/playbooks/service/root_account.yml @@ -11,4 +11,4 @@ roles: - role: debops.root_account - tags: [ 'role::root_account' ] + tags: [ 'role::root_account', 'skip::root_account' ] diff --git a/ansible/playbooks/service/roundcube.yml b/ansible/playbooks/service/roundcube.yml index 53326a9092..ae24ed8a77 100644 --- a/ansible/playbooks/service/roundcube.yml +++ b/ansible/playbooks/service/roundcube.yml @@ -14,13 +14,13 @@ tags: [ 'role::php', 'role::php:env', 'role::apt_preferences', 'role::logrotate' ] - role: debops.apt_preferences - tags: [ 'role::apt_preferences', 'role::nginx', 'role::php' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences', 'role::nginx', 'role::php' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' - '{{ php__apt_preferences__dependent_list }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ php__logrotate__dependent_config }}' @@ -30,21 +30,21 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.php - tags: [ 'role::php' ] + tags: [ 'role::php', 'skip::php' ] php__dependent_packages: - '{{ roundcube__php__dependent_packages }}' php__dependent_pools: - '{{ roundcube__php__dependent_pools }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ roundcube__nginx__dependent_servers }}' nginx__dependent_upstreams: - '{{ roundcube__nginx__dependent_upstreams }}' - role: debops.mariadb - tags: [ 'role::mariadb' ] + tags: [ 'role::mariadb', 'skip::mariadb' ] mariadb__dependent_users: - database: '{{ roundcube__database_map[roundcube__database].dbname }}' user: '{{ roundcube__database_map[roundcube__database].dbuser }}' @@ -58,4 +58,4 @@ when: roundcube__database_map[roundcube__database].dbtype == 'mysql' - role: debops.roundcube - tags: [ 'role::roundcube' ] + tags: [ 'role::roundcube', 'skip::roundcube' ] diff --git a/ansible/playbooks/service/rsnapshot.yml b/ansible/playbooks/service/rsnapshot.yml index fdd0d3908b..416d7eafaa 100644 --- a/ansible/playbooks/service/rsnapshot.yml +++ b/ansible/playbooks/service/rsnapshot.yml @@ -13,4 +13,4 @@ roles: - role: debops.rsnapshot - tags: [ 'role::rsnapshot' ] + tags: [ 'role::rsnapshot', 'skip::rsnapshot' ] diff --git a/ansible/playbooks/service/rstudio_server.yml b/ansible/playbooks/service/rstudio_server.yml index 874a06e616..7d0405fb68 100644 --- a/ansible/playbooks/service/rstudio_server.yml +++ b/ansible/playbooks/service/rstudio_server.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: - '{{ rstudio_server__etc_services__dependent_list }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ nginx__apt_preferences__dependent_list }}' - '{{ cran__apt_preferences__dependent_list }}' @@ -29,19 +29,19 @@ - '{{ nginx__ferm__dependent_rules }}' - role: debops.nginx - tags: [ 'role::nginx' ] + tags: [ 'role::nginx', 'skip::nginx' ] nginx__dependent_servers: - '{{ rstudio_server__nginx__dependent_servers }}' - 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' ] cran__dependent_packages: - '{{ rstudio_server__cran__dependent_packages }}' - role: debops.rstudio_server - tags: [ 'role::rstudio_server' ] + tags: [ 'role::rstudio_server', 'skip::rstudio_server' ] diff --git a/ansible/playbooks/service/rsyslog.yml b/ansible/playbooks/service/rsyslog.yml index 8c1e9a6e24..1062db6f92 100644 --- a/ansible/playbooks/service/rsyslog.yml +++ b/ansible/playbooks/service/rsyslog.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: - '{{ rsyslog__etc_services__dependent_list }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ rsyslog__apt_preferences__dependent_list }}' @@ -26,9 +26,9 @@ - '{{ rsyslog__ferm__dependent_rules }}' - role: debops.logrotate - tags: [ 'role::logrotate' ] + tags: [ 'role::logrotate', 'skip::logrotate' ] logrotate__dependent_config: - '{{ rsyslog__logrotate__dependent_config }}' - role: debops.rsyslog - tags: [ 'role::rsyslog' ] + tags: [ 'role::rsyslog', 'skip::rsyslog' ] diff --git a/ansible/playbooks/service/ruby.yml b/ansible/playbooks/service/ruby.yml index 7c6fd13d64..e9d98a7d9e 100644 --- a/ansible/playbooks/service/ruby.yml +++ b/ansible/playbooks/service/ruby.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: - '{{ ruby__apt_preferences__dependent_list }}' - role: debops.ruby - tags: [ 'role::ruby' ] + tags: [ 'role::ruby', 'skip::ruby' ] diff --git a/ansible/playbooks/service/salt.yml b/ansible/playbooks/service/salt.yml index c869260e8d..148cec8cee 100644 --- a/ansible/playbooks/service/salt.yml +++ b/ansible/playbooks/service/salt.yml @@ -11,12 +11,12 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ salt__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ salt__etc_services__dependent_list }}' @@ -26,4 +26,4 @@ - '{{ salt__ferm__dependent_rules }}' - role: debops.salt - tags: [ 'role::salt' ] + tags: [ 'role::salt', 'skip::salt' ] diff --git a/ansible/playbooks/service/samba.yml b/ansible/playbooks/service/samba.yml index f584b6f4fd..7ff2e43000 100644 --- a/ansible/playbooks/service/samba.yml +++ b/ansible/playbooks/service/samba.yml @@ -16,4 +16,4 @@ - '{{ samba__ferm__dependent_rules }}' - role: debops.samba - tags: [ 'role::samba' ] + tags: [ 'role::samba', 'skip::samba' ] diff --git a/ansible/playbooks/service/saslauthd.yml b/ansible/playbooks/service/saslauthd.yml index 3da4bda61a..9bef4d6d75 100644 --- a/ansible/playbooks/service/saslauthd.yml +++ b/ansible/playbooks/service/saslauthd.yml @@ -11,4 +11,4 @@ roles: - role: debops.saslauthd - tags: [ 'role::saslauthd' ] + tags: [ 'role::saslauthd', 'skip::saslauthd' ] diff --git a/ansible/playbooks/service/sftpusers.yml b/ansible/playbooks/service/sftpusers.yml index 9a1c10fc96..f4a6d859b3 100644 --- a/ansible/playbooks/service/sftpusers.yml +++ b/ansible/playbooks/service/sftpusers.yml @@ -11,7 +11,7 @@ roles: - role: debops.sftpusers - tags: [ 'role::sftpusers' ] + tags: [ 'role::sftpusers', 'skip::sftpusers' ] - role: debops.authorized_keys - tags: [ 'role::authorized_keys' ] + tags: [ 'role::authorized_keys', 'skip::authorized_keys' ] diff --git a/ansible/playbooks/service/sks.yml b/ansible/playbooks/service/sks.yml index a7030228fd..b2fc29d270 100644 --- a/ansible/playbooks/service/sks.yml +++ b/ansible/playbooks/service/sks.yml @@ -11,4 +11,4 @@ roles: - role: debops.sks - tags: [ 'role::sks' ] + tags: [ 'role::sks', 'skip::sks' ] diff --git a/ansible/playbooks/service/slapd.yml b/ansible/playbooks/service/slapd.yml index d415cf629d..f26196c316 100644 --- a/ansible/playbooks/service/slapd.yml +++ b/ansible/playbooks/service/slapd.yml @@ -16,9 +16,9 @@ - '{{ slapd_ferm_dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers_dependent_allow: - '{{ slapd_tcpwrappers_dependent_allow }}' - role: debops.slapd - tags: [ 'role::slapd' ] + tags: [ 'role::slapd', 'skip::slapd' ] diff --git a/ansible/playbooks/service/smstools.yml b/ansible/playbooks/service/smstools.yml index 0c1778eade..2966b6713e 100644 --- a/ansible/playbooks/service/smstools.yml +++ b/ansible/playbooks/service/smstools.yml @@ -19,15 +19,15 @@ - '{{ postfix__secret__directories }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ smstools__etc_services__dependent_list }}' - role: debops.rsyslog - tags: [ 'role::syslog' ] + tags: [ 'role::syslog', 'skip::rsyslog' ] - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers__dependent_allow: - '{{ smstools__tcpwrappers__dependent_allow }}' @@ -38,7 +38,7 @@ - '{{ smstools__ferm__dependent_rules }}' - role: debops.postfix - tags: [ 'role::postfix' ] + tags: [ 'role::postfix', 'skip::postfix' ] postfix__dependent_maincf: - role: 'smstools' config: '{{ smstools__postfix__dependent_maincf }}' @@ -47,4 +47,4 @@ config: '{{ smstools__postfix__dependent_mastercf }}' - role: debops.smstools - tags: [ 'role::smstools' ] + tags: [ 'role::smstools', 'skip::smstools' ] diff --git a/ansible/playbooks/service/snmpd.yml b/ansible/playbooks/service/snmpd.yml index 9d2f316cd3..82e79f6b71 100644 --- a/ansible/playbooks/service/snmpd.yml +++ b/ansible/playbooks/service/snmpd.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferencesA' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ snmpd_apt_preferences_dependent_list }}' @@ -21,9 +21,9 @@ - '{{ snmpd_ferm_dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers_dependent_allow: - '{{ snmpd_tcpwrappers_dependent_allow }}' - role: debops.snmpd - tags: [ 'role::snmpd' ] + tags: [ 'role::snmpd', 'skip::snmpd' ] diff --git a/ansible/playbooks/service/sshd.yml b/ansible/playbooks/service/sshd.yml index f396681d1c..54fb18b8cd 100644 --- a/ansible/playbooks/service/sshd.yml +++ b/ansible/playbooks/service/sshd.yml @@ -11,7 +11,7 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ sshd__apt_preferences__dependent_list }}' @@ -21,9 +21,9 @@ - '{{ sshd__ferm__dependent_rules }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers_dependent_allow: - '{{ sshd__tcpwrappers__dependent_allow }}' - role: debops.sshd - tags: [ 'role::sshd' ] + tags: [ 'role::sshd', 'skip::sshd' ] diff --git a/ansible/playbooks/service/stunnel.yml b/ansible/playbooks/service/stunnel.yml index eed76d013b..5f24a8ac05 100644 --- a/ansible/playbooks/service/stunnel.yml +++ b/ansible/playbooks/service/stunnel.yml @@ -11,7 +11,7 @@ roles: - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services_dependent_list: '{{ stunnel_services }}' - role: debops.ferm @@ -19,8 +19,8 @@ ferm_input_dependent_list: '{{ stunnel_services }}' - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] tcpwrappers_dependent_allow: '{{ stunnel_services }}' - role: debops.stunnel - tags: [ 'role::stunnel' ] + tags: [ 'role::stunnel', 'skip::stunnel' ] diff --git a/ansible/playbooks/service/sudo.yml b/ansible/playbooks/service/sudo.yml index ff9e823a80..5ed6c35ab7 100644 --- a/ansible/playbooks/service/sudo.yml +++ b/ansible/playbooks/service/sudo.yml @@ -11,4 +11,4 @@ roles: - role: debops.sudo - tags: [ 'role::sudo' ] + tags: [ 'role::sudo', 'skip::sudo' ] diff --git a/ansible/playbooks/service/swapfile.yml b/ansible/playbooks/service/swapfile.yml index 4332322252..3ead7e1556 100644 --- a/ansible/playbooks/service/swapfile.yml +++ b/ansible/playbooks/service/swapfile.yml @@ -11,4 +11,4 @@ roles: - role: debops.swapfile - tags: [ 'role::swapfile' ] + tags: [ 'role::swapfile', 'skip::swapfile' ] diff --git a/ansible/playbooks/service/sysctl.yml b/ansible/playbooks/service/sysctl.yml index 041b2d172b..dec8ae6658 100644 --- a/ansible/playbooks/service/sysctl.yml +++ b/ansible/playbooks/service/sysctl.yml @@ -11,4 +11,4 @@ roles: - role: debops.sysctl - tags: [ 'role::sysctl' ] + tags: [ 'role::sysctl', 'skip::sysctl' ] diff --git a/ansible/playbooks/service/sysfs.yml b/ansible/playbooks/service/sysfs.yml index a61abd3b7e..7a78846537 100644 --- a/ansible/playbooks/service/sysfs.yml +++ b/ansible/playbooks/service/sysfs.yml @@ -19,4 +19,4 @@ - '{{ sysfs__secret__directories | d([]) }}' - role: debops.sysfs - tags: [ 'role::sysfs' ] + tags: [ 'role::sysfs', 'skip::sysfs' ] diff --git a/ansible/playbooks/service/sysnews.yml b/ansible/playbooks/service/sysnews.yml index 3f955e3173..c93c53a9b0 100644 --- a/ansible/playbooks/service/sysnews.yml +++ b/ansible/playbooks/service/sysnews.yml @@ -11,4 +11,4 @@ roles: - role: debops.sysnews - tags: [ 'role::sysnews' ] + tags: [ 'role::sysnews', 'skip::sysnews' ] diff --git a/ansible/playbooks/service/system_groups.yml b/ansible/playbooks/service/system_groups.yml index f940a44fbd..a972593a0d 100644 --- a/ansible/playbooks/service/system_groups.yml +++ b/ansible/playbooks/service/system_groups.yml @@ -11,7 +11,7 @@ roles: - 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' ] diff --git a/ansible/playbooks/service/tcpwrappers.yml b/ansible/playbooks/service/tcpwrappers.yml index 1e86b5da4b..8ad1707788 100644 --- a/ansible/playbooks/service/tcpwrappers.yml +++ b/ansible/playbooks/service/tcpwrappers.yml @@ -11,4 +11,4 @@ roles: - role: debops.tcpwrappers - tags: [ 'role::tcpwrappers' ] + tags: [ 'role::tcpwrappers', 'skip::tcpwrappers' ] diff --git a/ansible/playbooks/service/tftpd.yml b/ansible/playbooks/service/tftpd.yml index 3504d9e155..f913fc4553 100644 --- a/ansible/playbooks/service/tftpd.yml +++ b/ansible/playbooks/service/tftpd.yml @@ -11,4 +11,4 @@ roles: - role: debops.tftpd - tags: [ 'role::tftpd' ] + tags: [ 'role::tftpd', 'skip::tftpd' ] diff --git a/ansible/playbooks/service/tgt.yml b/ansible/playbooks/service/tgt.yml index f2949f875c..ec228e0e91 100644 --- a/ansible/playbooks/service/tgt.yml +++ b/ansible/playbooks/service/tgt.yml @@ -11,4 +11,4 @@ roles: - role: debops.tgt - tags: [ 'role::tgt' ] + tags: [ 'role::tgt', 'skip::tgt' ] diff --git a/ansible/playbooks/service/tinc-persistent_paths.yml b/ansible/playbooks/service/tinc-persistent_paths.yml index 4e8fb76e51..aa02b1db04 100644 --- a/ansible/playbooks/service/tinc-persistent_paths.yml +++ b/ansible/playbooks/service/tinc-persistent_paths.yml @@ -18,11 +18,11 @@ secret__directories: '{{ tinc__env_secret__directories }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: '{{ tinc__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: '{{ tinc__env_etc_services__dependent_list }}' - role: debops.ferm @@ -30,8 +30,8 @@ ferm__dependent_rules: '{{ tinc__env_ferm__dependent_rules }}' - role: debops.tinc - tags: [ 'role::tinc' ] + tags: [ 'role::tinc', 'skip::tinc' ] - role: debops.persistent_paths - tags: [ 'role::persistent_paths' ] + tags: [ 'role::persistent_paths', 'skip::persistent_paths' ] persistent_paths__dependent_paths: '{{ tinc__persistent_paths__dependent_paths }}' diff --git a/ansible/playbooks/service/tinc-plain.yml b/ansible/playbooks/service/tinc-plain.yml index d4b3089a12..a30a4e75ba 100644 --- a/ansible/playbooks/service/tinc-plain.yml +++ b/ansible/playbooks/service/tinc-plain.yml @@ -18,11 +18,11 @@ secret__directories: '{{ tinc__env_secret__directories }}' - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: '{{ tinc__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: '{{ tinc__env_etc_services__dependent_list }}' - role: debops.ferm @@ -30,4 +30,4 @@ ferm__dependent_rules: '{{ tinc__env_ferm__dependent_rules }}' - role: debops.tinc - tags: [ 'role::tinc' ] + tags: [ 'role::tinc', 'skip::tinc' ] diff --git a/ansible/playbooks/service/unattended_upgrades.yml b/ansible/playbooks/service/unattended_upgrades.yml index 5c87722d5e..be0ed344c3 100644 --- a/ansible/playbooks/service/unattended_upgrades.yml +++ b/ansible/playbooks/service/unattended_upgrades.yml @@ -11,4 +11,4 @@ roles: - role: debops.unattended_upgrades - tags: [ 'role::unattended_upgrades' ] + tags: [ 'role::unattended_upgrades', 'skip::unattended_upgrades' ] diff --git a/ansible/playbooks/service/unbound.yml b/ansible/playbooks/service/unbound.yml index 12e9b73a7a..48a1670f7f 100644 --- a/ansible/playbooks/service/unbound.yml +++ b/ansible/playbooks/service/unbound.yml @@ -11,14 +11,14 @@ roles: - role: debops.apt_preferences - tags: [ 'role::apt_preferences' ] + tags: [ 'role::apt_preferences', 'skip::apt_preferences' ] apt_preferences__dependent_list: - '{{ unbound__apt_preferences__dependent_list }}' - role: debops.etc_services - tags: [ 'role::etc_services' ] + tags: [ 'role::etc_services', 'skip::etc_services' ] etc_services__dependent_list: - '{{ unbound__etc_services__dependent_list }}' - role: debops.unbound - tags: [ 'role::unbound' ] + tags: [ 'role::unbound', 'skip::unbound' ] diff --git a/ansible/playbooks/service/users.yml b/ansible/playbooks/service/users.yml index 93468c9c76..31915743fe 100644 --- a/ansible/playbooks/service/users.yml +++ b/ansible/playbooks/service/users.yml @@ -11,4 +11,4 @@ roles: - role: debops.users - tags: [ 'role::users' ] + tags: [ 'role::users', 'skip::users' ]