From defe320d864996045e281e2f97765fa687cc7ef8 Mon Sep 17 00:00:00 2001 From: lijunjie Date: Wed, 23 Jan 2019 16:22:20 +0800 Subject: [PATCH] Fix the misspelling of "container" Change-Id: I201ed221941df93ed61eac3f256e8a60a0534c9b Signed-off-by: Kevin Carter --- elk_metrics_6x/tests/functional.yml | 6 +++--- elk_metrics_6x/tests/run-setup.yml | 2 +- osquery/tests/functional.yml | 6 +++--- osquery/tests/run-setup.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/elk_metrics_6x/tests/functional.yml b/elk_metrics_6x/tests/functional.yml index 9b971cdf..9858d5fd 100644 --- a/elk_metrics_6x/tests/functional.yml +++ b/elk_metrics_6x/tests/functional.yml @@ -31,7 +31,7 @@ ANSIBLE_ROLES_PATH: "${HOME}/ansible_venv/repositories/roles" vars: - inventory_file: "inventory/test-{{ (contianer_inventory | bool) | ternary('container', 'metal') }}-inventory.yml" + inventory_file: "inventory/test-{{ (container_inventory | bool) | ternary('container', 'metal') }}-inventory.yml" pre_tasks: - name: Create swap file @@ -122,7 +122,7 @@ chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests" when: - ansible_service_mgr != 'systemd' or - not (contianer_inventory | bool) + not (container_inventory | bool) - name: Run environment setup become: yes @@ -134,7 +134,7 @@ chdir: "src/{{ current_test_repo }}/elk_metrics_6x/tests" when: - ansible_service_mgr == 'systemd' - - contianer_inventory | bool + - container_inventory | bool - name: Wait 15 seconds command: "sleep 15" diff --git a/elk_metrics_6x/tests/run-setup.yml b/elk_metrics_6x/tests/run-setup.yml index 7fadd520..bd5d179b 100644 --- a/elk_metrics_6x/tests/run-setup.yml +++ b/elk_metrics_6x/tests/run-setup.yml @@ -44,7 +44,7 @@ - name: Set inventory for test set_fact: - contianer_inventory: "{{ test_clustered_elk | default(false) | bool }}" + container_inventory: "{{ test_clustered_elk | default(false) | bool }}" post_tasks: - name: Ensure the log directory exists diff --git a/osquery/tests/functional.yml b/osquery/tests/functional.yml index 75ed57c7..388c5937 100644 --- a/osquery/tests/functional.yml +++ b/osquery/tests/functional.yml @@ -31,7 +31,7 @@ ANSIBLE_ROLES_PATH: "${HOME}/ansible_venv/repositories/roles" vars: - inventory_file: "inventory/test-{{ (contianer_inventory | bool) | ternary('container', 'metal') }}-inventory.yml" + inventory_file: "inventory/test-{{ (container_inventory | bool) | ternary('container', 'metal') }}-inventory.yml" pre_tasks: - name: Create swap file @@ -122,7 +122,7 @@ chdir: "src/{{ current_test_repo }}/osquery/tests" when: - ansible_service_mgr != 'systemd' or - not (contianer_inventory | bool) + not (container_inventory | bool) - name: Run environment setup become: yes @@ -134,7 +134,7 @@ chdir: "src/{{ current_test_repo }}/osquery/tests" when: - ansible_service_mgr == 'systemd' - - contianer_inventory | bool + - container_inventory | bool - name: Wait 15 seconds command: "sleep 15" diff --git a/osquery/tests/run-setup.yml b/osquery/tests/run-setup.yml index f625c012..9228b6bd 100644 --- a/osquery/tests/run-setup.yml +++ b/osquery/tests/run-setup.yml @@ -44,7 +44,7 @@ - name: Set inventory for test set_fact: - contianer_inventory: "{{ test_clustered_kolide | default(false) | bool }}" + container_inventory: "{{ test_clustered_kolide | default(false) | bool }}" post_tasks: - name: Ensure the log directory exists