From daffdb9f913259a16cc4704d9a4ad5a75d6330ff Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 19 Apr 2017 19:56:49 +0200
Subject: [PATCH] Ansible 2.3.0.0 remove reserved variable "hosts"
---
playbooks/role.yml | 2 +-
scripts/apache-config.yml | 2 +-
scripts/composer-update.yml | 2 +-
scripts/connectivity.yml | 2 +-
scripts/drupal-config.yml | 2 +-
scripts/drupal-deploy.yml | 2 +-
scripts/drush-aliases.yml | 2 +-
scripts/elastalert-rules.yml | 2 +-
scripts/elastalert.yml | 2 +-
scripts/fail2ban.yml | 2 +-
scripts/firewall-config.yml | 2 +-
scripts/fluentd-client.yml | 2 +-
scripts/fluentd.yml | 2 +-
scripts/haproxy-certs.yml | 2 +-
scripts/haproxy-config.yml | 2 +-
scripts/jailkit-update.yml | 2 +-
scripts/jailkit-upgrade.yml | 2 +-
scripts/localhost.yml | 2 +-
scripts/netdata.yml | 2 +-
scripts/network.yml | 2 +-
scripts/nextcloud-plugins.yml | 2 +-
scripts/nextcloud.yml | 2 +-
scripts/piwik.yml | 2 +-
scripts/removehost.yml | 2 +-
scripts/role.yml | 6 ++----
scripts/uptime.yml | 2 +-
scripts/userfiles.yml | 2 +-
scripts/users.yml | 2 +-
scripts/varnish-config.yml | 2 +-
scripts/youtrack.yml | 2 +-
30 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/playbooks/role.yml b/playbooks/role.yml
index a813354a..dbc9d10a 100644
--- a/playbooks/role.yml
+++ b/playbooks/role.yml
@@ -8,7 +8,7 @@
- include: "validate.yml"
- name: "Execute Role {{ role }}"
- hosts: "{{ hosts|default('all') }}:!norootserver"
+ hosts: "{{ hostslimit|default('all') }}:!norootserver"
become: yes
roles:
- "{{ role }}"
diff --git a/scripts/apache-config.yml b/scripts/apache-config.yml
index 5530c283..426dc287 100644
--- a/scripts/apache-config.yml
+++ b/scripts/apache-config.yml
@@ -16,7 +16,7 @@ command:
- name: 'tags'
value: 'ApacheConfig'
- name: 'extra-vars'
- value: 'hosts=%s role=%s'
+ value: 'hostslimit=%s role=%s'
args:
- 'limit'
- 'application'
diff --git a/scripts/composer-update.yml b/scripts/composer-update.yml
index 91514ab2..c89e7dfb 100644
--- a/scripts/composer-update.yml
+++ b/scripts/composer-update.yml
@@ -6,7 +6,7 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=composer'
+ value: 'hostslimit=%s role=composer'
args:
- 'limit'
- name: 'tags'
diff --git a/scripts/connectivity.yml b/scripts/connectivity.yml
index 30284ec0..ed8d8c1a 100644
--- a/scripts/connectivity.yml
+++ b/scripts/connectivity.yml
@@ -7,6 +7,6 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=commonconnect'
+ value: 'hostslimit=%s role=commonconnect'
args:
- 'limit'
diff --git a/scripts/drupal-config.yml b/scripts/drupal-config.yml
index ef8d8673..8c052050 100644
--- a/scripts/drupal-config.yml
+++ b/scripts/drupal-config.yml
@@ -22,7 +22,7 @@ arguments:
- 'apache'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=drupal'
+ value: 'hostslimit=%s role=drupal'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/drupal-deploy.yml b/scripts/drupal-deploy.yml
index 4c1e103a..fd704ee3 100644
--- a/scripts/drupal-deploy.yml
+++ b/scripts/drupal-deploy.yml
@@ -20,7 +20,7 @@ command:
- name: 'tags'
value: 'deploy'
- name: 'extra-vars'
- value: 'hosts=%s role=drupal'
+ value: 'hostslimit=%s role=drupal'
args:
- 'host'
- name: 'extra-vars'
diff --git a/scripts/drush-aliases.yml b/scripts/drush-aliases.yml
index fe2dd320..4546562d 100644
--- a/scripts/drush-aliases.yml
+++ b/scripts/drush-aliases.yml
@@ -17,7 +17,7 @@ command:
condition: 'fetch'
value: 'DrushUpdateAliases'
- name: 'extra-vars'
- value: 'hosts=%s role=drush'
+ value: 'hostslimit=%s role=drush'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/elastalert-rules.yml b/scripts/elastalert-rules.yml
index dee89b43..ddeff1e7 100644
--- a/scripts/elastalert-rules.yml
+++ b/scripts/elastalert-rules.yml
@@ -10,6 +10,6 @@ command:
- name: 'tags'
value: 'Rules'
- name: 'extra-vars'
- value: 'hosts=%s role=elastalert'
+ value: 'hostslimit=%s role=elastalert'
args:
- 'limit'
diff --git a/scripts/elastalert.yml b/scripts/elastalert.yml
index 39db9d67..3f88c5b3 100644
--- a/scripts/elastalert.yml
+++ b/scripts/elastalert.yml
@@ -8,6 +8,6 @@ arguments:
- 'elasticsearch'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=elastalert'
+ value: 'hostslimit=%s role=elastalert'
args:
- 'limit'
diff --git a/scripts/fail2ban.yml b/scripts/fail2ban.yml
index 1e2523bb..74895019 100644
--- a/scripts/fail2ban.yml
+++ b/scripts/fail2ban.yml
@@ -3,6 +3,6 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=fail2ban'
+ value: 'hostslimit=%s role=fail2ban'
args:
- 'limit'
diff --git a/scripts/firewall-config.yml b/scripts/firewall-config.yml
index bf561eae..8f6e1c40 100644
--- a/scripts/firewall-config.yml
+++ b/scripts/firewall-config.yml
@@ -8,6 +8,6 @@ command:
- name: 'tags'
value: 'firewall'
- name: 'extra-vars'
- value: 'hosts=%s role=common'
+ value: 'hostslimit=%s role=common'
args:
- 'limit'
diff --git a/scripts/fluentd-client.yml b/scripts/fluentd-client.yml
index 3191fd45..3d42c785 100644
--- a/scripts/fluentd-client.yml
+++ b/scripts/fluentd-client.yml
@@ -3,6 +3,6 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=fluentd-client'
+ value: 'hostslimit=%s role=fluentd-client'
args:
- 'limit'
diff --git a/scripts/fluentd.yml b/scripts/fluentd.yml
index 29dab2a9..9691e1f0 100644
--- a/scripts/fluentd.yml
+++ b/scripts/fluentd.yml
@@ -3,6 +3,6 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=fluentd'
+ value: 'hostslimit=%s role=fluentd'
args:
- 'limit'
diff --git a/scripts/haproxy-certs.yml b/scripts/haproxy-certs.yml
index 42e8a591..00ad230a 100644
--- a/scripts/haproxy-certs.yml
+++ b/scripts/haproxy-certs.yml
@@ -12,6 +12,6 @@ command:
- name: 'tags'
value: 'Certs'
- name: 'extra-vars'
- value: 'hosts=%s role=haproxy'
+ value: 'hostslimit=%s role=haproxy'
args:
- 'limit'
diff --git a/scripts/haproxy-config.yml b/scripts/haproxy-config.yml
index ca5ecb67..4764dbb5 100644
--- a/scripts/haproxy-config.yml
+++ b/scripts/haproxy-config.yml
@@ -12,6 +12,6 @@ command:
- name: 'tags'
value: 'Config'
- name: 'extra-vars'
- value: 'hosts=%s role=haproxy'
+ value: 'hostslimit=%s role=haproxy'
args:
- 'limit'
diff --git a/scripts/jailkit-update.yml b/scripts/jailkit-update.yml
index 06ddc1a6..f3707f9d 100644
--- a/scripts/jailkit-update.yml
+++ b/scripts/jailkit-update.yml
@@ -10,7 +10,7 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=jailkit jailsite_init_force=True'
+ value: 'hostslimit=%s role=jailkit jailsite_init_force=True'
args:
- 'limit'
- name: 'start-at-task'
diff --git a/scripts/jailkit-upgrade.yml b/scripts/jailkit-upgrade.yml
index 3956aa5c..8dda5b16 100644
--- a/scripts/jailkit-upgrade.yml
+++ b/scripts/jailkit-upgrade.yml
@@ -6,7 +6,7 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=jailkit'
+ value: 'hostslimit=%s role=jailkit'
args:
- 'limit'
- name: 'start-at-task'
diff --git a/scripts/localhost.yml b/scripts/localhost.yml
index 2760ab94..b4fab22f 100644
--- a/scripts/localhost.yml
+++ b/scripts/localhost.yml
@@ -18,7 +18,7 @@ arguments:
company: 'local'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=commonconnect admins=%s'
+ value: 'hostslimit=%s role=commonconnect admins=%s'
args:
- 'host'
- 'user'
diff --git a/scripts/netdata.yml b/scripts/netdata.yml
index ef4d1318..57492280 100644
--- a/scripts/netdata.yml
+++ b/scripts/netdata.yml
@@ -11,7 +11,7 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=netdata'
+ value: 'hostslimit=%s role=netdata'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/network.yml b/scripts/network.yml
index 654ca611..015147c3 100644
--- a/scripts/network.yml
+++ b/scripts/network.yml
@@ -8,6 +8,6 @@ command:
- name: 'tags'
value: 'network'
- name: 'extra-vars'
- value: 'hosts=%s role=common'
+ value: 'hostslimit=%s role=common'
args:
- 'limit'
diff --git a/scripts/nextcloud-plugins.yml b/scripts/nextcloud-plugins.yml
index 0fc0b13a..054506bc 100644
--- a/scripts/nextcloud-plugins.yml
+++ b/scripts/nextcloud-plugins.yml
@@ -20,7 +20,7 @@ command:
- name: 'tags'
value: 'plugins'
- name: 'extra-vars'
- value: 'hosts=%s role=nextcloud'
+ value: 'hostslimit=%s role=nextcloud'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/nextcloud.yml b/scripts/nextcloud.yml
index a85c8817..80fac86e 100644
--- a/scripts/nextcloud.yml
+++ b/scripts/nextcloud.yml
@@ -20,7 +20,7 @@ command:
- name: 'tags'
value: 'deploy'
- name: 'extra-vars'
- value: 'hosts=%s role=nextcloud'
+ value: 'hostslimit=%s role=nextcloud'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/piwik.yml b/scripts/piwik.yml
index 4a46ede7..8bb785e0 100644
--- a/scripts/piwik.yml
+++ b/scripts/piwik.yml
@@ -21,7 +21,7 @@ command:
- name: 'tags'
value: 'deploy'
- name: 'extra-vars'
- value: 'hosts=%s role=piwik'
+ value: 'hostslimit=%s role=piwik'
args:
- 'limit'
- name: 'extra-vars'
diff --git a/scripts/removehost.yml b/scripts/removehost.yml
index 4496c0eb..583c1576 100644
--- a/scripts/removehost.yml
+++ b/scripts/removehost.yml
@@ -14,7 +14,7 @@ arguments:
playbook: 'removehost'
command:
- name: 'extra-vars'
- value: 'hosts=%s'
+ value: 'hostslimit=%s'
args:
- 'host'
- name: 'extra-vars'
diff --git a/scripts/role.yml b/scripts/role.yml
index ba955281..2a65717d 100644
--- a/scripts/role.yml
+++ b/scripts/role.yml
@@ -3,13 +3,11 @@ cli:
arguments:
role:
help: 'Role to execute'
- hosts:
- help: 'Host name or pattern'
arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=%s'
+ value: 'hostslimit=%s role=%s'
args:
- - 'hosts'
+ - 'limit'
- 'role'
diff --git a/scripts/uptime.yml b/scripts/uptime.yml
index 528f76ba..bb4d3058 100644
--- a/scripts/uptime.yml
+++ b/scripts/uptime.yml
@@ -8,6 +8,6 @@ command:
- name: 'start-at-task'
value: 'Uptime Role'
- name: 'extra-vars'
- value: 'hosts=%s role=uptime'
+ value: 'hostslimit=%s role=uptime'
args:
- 'limit'
diff --git a/scripts/userfiles.yml b/scripts/userfiles.yml
index d50010e2..c1fedafb 100644
--- a/scripts/userfiles.yml
+++ b/scripts/userfiles.yml
@@ -8,6 +8,6 @@ command:
- name: 'tags'
value: 'userfiles'
- name: 'extra-vars'
- value: 'hosts=%s role=common'
+ value: 'hostslimit=%s role=common'
args:
- 'limit'
diff --git a/scripts/users.yml b/scripts/users.yml
index 09970e02..99b12c23 100644
--- a/scripts/users.yml
+++ b/scripts/users.yml
@@ -7,7 +7,7 @@ arguments:
playbook: 'role'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=commonauth'
+ value: 'hostslimit=%s role=commonauth'
args:
- 'limit'
follower:
diff --git a/scripts/varnish-config.yml b/scripts/varnish-config.yml
index a2160f43..1e6f7fdb 100644
--- a/scripts/varnish-config.yml
+++ b/scripts/varnish-config.yml
@@ -8,6 +8,6 @@ command:
- name: 'tags'
value: 'Config'
- name: 'extra-vars'
- value: 'hosts=%s role=varnish'
+ value: 'hostslimit=%s role=varnish'
args:
- 'limit'
diff --git a/scripts/youtrack.yml b/scripts/youtrack.yml
index 9d338119..e1e09590 100644
--- a/scripts/youtrack.yml
+++ b/scripts/youtrack.yml
@@ -13,6 +13,6 @@ arguments:
- 'php'
command:
- name: 'extra-vars'
- value: 'hosts=%s role=outrack'
+ value: 'hostslimit=%s role=outrack'
args:
- 'limit'
--
GitLab