Fix cosmetic problems in YAML source

This change corrects problems reported by the `yamllint` linter.

Since key duplication problems were removed in 4d48711, this commit
mainly fixes trailing spaces and extra empty lines at beginning/end of
files.
pull/18477/head
Adrien Vergé 9 years ago committed by Matt Clay
parent 8874c1dc39
commit 0e834fc9e4

@ -14,4 +14,3 @@
- src: git@github.com:geerlingguy/ansible-role-php.git
scm: git
name: php

@ -3,4 +3,3 @@ win_output_dir: 'C:\ansible_testing'
output_dir: ~/ansible_testing
non_root_test_user: ansible
pip_test_package: isort

@ -92,4 +92,3 @@
that:
- 'result.changed'
- 'result.deployment.name == "{{ instance_name }}"'

@ -1,4 +1,3 @@
- name: register basic session with consul
consul_session:
name: session1

@ -185,4 +185,3 @@
- 'item.changed == True'
- '"{{resource_prefix}}" in item.ansible_facts.ec2_elbs'
with_items: result.results

@ -405,4 +405,3 @@
- 'result.changed'
- 'result.elb.name == "{{tag_prefix}}"'
- 'result.elb.status == "deleted"'

@ -2,4 +2,3 @@
# defaults file for test_ec2_group
ec2_group_name: '{{resource_prefix}}'
ec2_group_description: 'Created by ansible integration tests'

@ -217,4 +217,3 @@
that:
- 'result.failed'
- 'result.msg == "Cannot give both image (debian-7) and snapshot ({{ instance_name }}-snapshot)"'

@ -7,4 +7,3 @@ project_id: "{{ gce_project_id }}"
zone: "us-central1-c"
machine_type: f1-micro
image: debian-8

@ -88,7 +88,6 @@
# ============================================================
- name: Test rax_cbs with creds, region, name and invalid size
rax_cbs:

@ -57,8 +57,6 @@
# ============================================================
- name: Test rax_scaling_group with creds, region and required args
rax_scaling_group:
@ -232,7 +230,6 @@
# ============================================================
- name: Test rax_scaling_group with invalid load balancers
rax_scaling_group:
@ -260,7 +257,6 @@
# ============================================================
- name: Build a CLB to test rax_scaling_group with
rax_clb:
@ -284,7 +280,6 @@
# ============================================================
- name: Test rax_scaling_group with load balancers
rax_scaling_group:
@ -339,7 +334,6 @@
# ============================================================
- name: Test rax_scaling_group files change 1
rax_scaling_group:
@ -470,7 +464,6 @@
# ============================================================
- name: Change max_entities
rax_scaling_group:
@ -496,7 +489,6 @@
# ============================================================
- name: Change min_entities
rax_scaling_group:
@ -522,7 +514,6 @@
# ============================================================
- name: Change server_name
rax_scaling_group:
@ -548,7 +539,6 @@
# ============================================================
- name: Change image
rax_scaling_group:
@ -574,7 +564,6 @@
# ============================================================
- name: Change flavor
rax_scaling_group:
@ -600,7 +589,6 @@
# ============================================================
- name: Change disk_config
rax_scaling_group:
@ -649,7 +637,6 @@
# ============================================================
- name: Change networks
rax_scaling_group:
@ -678,7 +665,6 @@
# ============================================================
- name: Change load balancers
rax_scaling_group:
@ -711,7 +697,6 @@
# ============================================================
- name: Create keypair to test with
rax_keypair:
@ -733,7 +718,6 @@
# ============================================================
- name: Change key_name
rax_scaling_group:
@ -767,7 +751,6 @@
# ============================================================
- name: Change config_drive
rax_scaling_group:
@ -837,7 +820,6 @@
# ============================================================
- name: Delete keypair
rax_keypair:
@ -858,7 +840,6 @@
# ============================================================
- name: Delete CLB
rax_clb:

@ -15,4 +15,3 @@
- name: remove ppa key
apt_key: id={{test_ppa_key}} state=absent
ignore_errors: true

@ -18,4 +18,3 @@
- include: 'apt.yml'
when: ansible_distribution in ('Ubuntu')

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -90,4 +90,3 @@
that:
- "result.state == 'file'"
- "result.checksum == '505359f48c65b3904127cf62b912991d4da7ed6d'"

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -80,4 +80,3 @@
name: "{{ become_test_user }}"
state: "absent"
remove: "yes"

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -51,4 +51,3 @@
that:
- 'async_hello_ansible.msg == "Hello, Ansible!"'
when: not async_hello_ansible|skipped

@ -3,4 +3,3 @@
- role: test_binary_modules
tags:
- test_binary_modules

@ -38,5 +38,3 @@
assert:
that:
- "not shell_result.changed"

@ -15,4 +15,3 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -14,5 +14,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -14,5 +14,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -14,5 +14,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -14,5 +14,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -14,5 +14,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -20,4 +20,3 @@
# We want to test that for people who don't want to upgrade their systems.
- include: 'dnf.yml'
when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version >= 23)

@ -3,4 +3,3 @@
state: present
# Note: add docker-registry when available
name: docker.io,python-docker,netcat-openbsd,nginx

@ -20,4 +20,3 @@
#- include: registry-tests.yml
# Add other distributions as the proper packages become available
# when: ansible_distribution in ['Fedora']

@ -186,4 +186,3 @@
line: "127.0.0.1 dockertest.ansible.com"
dest: /etc/hosts
state: absent

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,4 +1,3 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: eapi.yaml, tags: ['eapi'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,4 +1,3 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: eapi.yaml, tags: ['eapi'] }

@ -1,4 +1,3 @@
---
testcase: "*"
test_items: []

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,4 +1,3 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: eapi.yaml, tags: ['eapi'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,4 +1,3 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: eapi.yaml, tags: ['eapi'] }

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -66,4 +66,3 @@
that:
- "'failed' in result and not result.failed"
- "'failed_when_result' in result and not result.failed_when_result"

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -94,4 +94,3 @@
assert:
that:
'diff.stdout == ""'

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -109,4 +109,3 @@
assert:
that:
- "users | json_query('[*].hosts[].host') == ['host_a', 'host_b', 'host_c', 'host_d']"

@ -129,4 +129,3 @@
- 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
- 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -37,4 +37,3 @@
- name: verify gist is installed
shell: gem list | egrep '^gist '

@ -1,4 +1,3 @@
dependencies:
- prepare_tests
- prepare_http_tests

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -15,4 +15,3 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.

@ -39,4 +39,3 @@
assert:
that:
- "hash_behavior.stdout == 'merge' and test_hash == merged_hash or hash_behavior.stdout == 'replace' and test_hash == replaced_hash"

@ -1,3 +1,2 @@
dependencies:
- prepare_tests

@ -72,7 +72,3 @@
assert:
that:
- "not hg_result2.changed"

@ -20,4 +20,3 @@
shell: /bin/false
register: failed
ignore_errors: True

@ -80,5 +80,3 @@
# both these via a handler include
- included_handler
- verify_handler

@ -1,4 +1,3 @@
- name: verify playbook includes can take parameters
hosts: testhost
tasks:

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

@ -1,3 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }

@ -13,5 +13,3 @@
with_items: "{{ test_items }}"
loop_control:
loop_var: test_case_to_run

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save