From dbc1ed3af3546c6e3a944909a9c42d65b7115de5 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 19 Jun 2018 09:54:24 +0000 Subject: [PATCH] Add an 'always' tag to cluster layout task include The templates which generate the configuration for the various components require access to the facts defining the cluster layout. Running the setup*.yml playbooks with --tags config would not include common_task_data_node_hosts.yml and templating would fail due to undefined vars. This change applys an 'always' tag to all uses of the include. Change-Id: I6c55a60aef54f9bb26eb9a2af08315265daa82d9 --- elk_metrics_6x/installAPMserver.yml | 2 ++ elk_metrics_6x/installAuditbeat.yml | 2 ++ elk_metrics_6x/installElastic.yml | 2 ++ elk_metrics_6x/installFilebeat.yml | 2 ++ elk_metrics_6x/installHeartbeat.yml | 2 ++ elk_metrics_6x/installJournalbeat.yml | 2 ++ elk_metrics_6x/installLogstash.yml | 3 ++- elk_metrics_6x/installMetricbeat.yml | 2 ++ elk_metrics_6x/installPacketbeat.yml | 2 ++ elk_metrics_6x/setupAPMserver.yml | 2 ++ elk_metrics_6x/setupAuditbeat.yml | 2 ++ elk_metrics_6x/setupFilebeat.yml | 2 ++ elk_metrics_6x/setupHeartbeat.yml | 2 ++ elk_metrics_6x/setupJournalbeat.yml | 2 ++ elk_metrics_6x/setupMetricbeat.yml | 2 ++ elk_metrics_6x/setupPacketbeat.yml | 2 ++ 16 files changed, 32 insertions(+), 1 deletion(-) diff --git a/elk_metrics_6x/installAPMserver.yml b/elk_metrics_6x/installAPMserver.yml index 62ab1235..97a4fa58 100644 --- a/elk_metrics_6x/installAPMserver.yml +++ b/elk_metrics_6x/installAPMserver.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installAuditbeat.yml b/elk_metrics_6x/installAuditbeat.yml index 574b6628..bafe2e60 100644 --- a/elk_metrics_6x/installAuditbeat.yml +++ b/elk_metrics_6x/installAuditbeat.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installElastic.yml b/elk_metrics_6x/installElastic.yml index 7c2c9f3d..635de75a 100644 --- a/elk_metrics_6x/installElastic.yml +++ b/elk_metrics_6x/installElastic.yml @@ -10,6 +10,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Set memory fact to half diff --git a/elk_metrics_6x/installFilebeat.yml b/elk_metrics_6x/installFilebeat.yml index 1930d4c1..fc9fcf7b 100644 --- a/elk_metrics_6x/installFilebeat.yml +++ b/elk_metrics_6x/installFilebeat.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installHeartbeat.yml b/elk_metrics_6x/installHeartbeat.yml index 2d5a8ff7..c745a997 100644 --- a/elk_metrics_6x/installHeartbeat.yml +++ b/elk_metrics_6x/installHeartbeat.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installJournalbeat.yml b/elk_metrics_6x/installJournalbeat.yml index 04424b0b..591c664e 100644 --- a/elk_metrics_6x/installJournalbeat.yml +++ b/elk_metrics_6x/installJournalbeat.yml @@ -26,6 +26,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_go1.10.1.yml diff --git a/elk_metrics_6x/installLogstash.yml b/elk_metrics_6x/installLogstash.yml index 98ad4d2c..78d1caff 100644 --- a/elk_metrics_6x/installLogstash.yml +++ b/elk_metrics_6x/installLogstash.yml @@ -9,7 +9,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml - + tags: + - always tasks: - name: Set quarter memory fact set_fact: diff --git a/elk_metrics_6x/installMetricbeat.yml b/elk_metrics_6x/installMetricbeat.yml index a1bc2616..d04e880b 100644 --- a/elk_metrics_6x/installMetricbeat.yml +++ b/elk_metrics_6x/installMetricbeat.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installPacketbeat.yml b/elk_metrics_6x/installPacketbeat.yml index 2ad3c7a1..e52a159a 100644 --- a/elk_metrics_6x/installPacketbeat.yml +++ b/elk_metrics_6x/installPacketbeat.yml @@ -12,6 +12,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/setupAPMserver.yml b/elk_metrics_6x/setupAPMserver.yml index 433d4b9f..5f7408de 100644 --- a/elk_metrics_6x/setupAPMserver.yml +++ b/elk_metrics_6x/setupAPMserver.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupAuditbeat.yml b/elk_metrics_6x/setupAuditbeat.yml index 75e6a0bb..8656f69d 100644 --- a/elk_metrics_6x/setupAuditbeat.yml +++ b/elk_metrics_6x/setupAuditbeat.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupFilebeat.yml b/elk_metrics_6x/setupFilebeat.yml index 56644f94..8f0739ad 100644 --- a/elk_metrics_6x/setupFilebeat.yml +++ b/elk_metrics_6x/setupFilebeat.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupHeartbeat.yml b/elk_metrics_6x/setupHeartbeat.yml index 0319f03b..018d8b40 100644 --- a/elk_metrics_6x/setupHeartbeat.yml +++ b/elk_metrics_6x/setupHeartbeat.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupJournalbeat.yml b/elk_metrics_6x/setupJournalbeat.yml index 192233d3..9c5d6bfd 100644 --- a/elk_metrics_6x/setupJournalbeat.yml +++ b/elk_metrics_6x/setupJournalbeat.yml @@ -28,6 +28,8 @@ meta: end_play - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupMetricbeat.yml b/elk_metrics_6x/setupMetricbeat.yml index c9fb9401..e91e47e8 100644 --- a/elk_metrics_6x/setupMetricbeat.yml +++ b/elk_metrics_6x/setupMetricbeat.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates diff --git a/elk_metrics_6x/setupPacketbeat.yml b/elk_metrics_6x/setupPacketbeat.yml index 3991858a..e18fc2d9 100644 --- a/elk_metrics_6x/setupPacketbeat.yml +++ b/elk_metrics_6x/setupPacketbeat.yml @@ -8,6 +8,8 @@ pre_tasks: - include_tasks: common_task_data_node_hosts.yml + tags: + - always tasks: - name: Load templates