openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Fix the misspelling of "container""

Browse Source
This commit is contained in:
Zuul 2019-01-23 22:34:34 +00:00 committed by Gerrit Code Review
commit a54602805f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elk_metrics_6x/tests/functional.yml
View File

@ -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"

2
elk_metrics_6x/tests/run-setup.yml
View File

@ -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

6
osquery/tests/functional.yml
View File

@ -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"

2
osquery/tests/run-setup.yml
View File

@ -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