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.
This commit is contained in:
Adrien Vergé 2016-04-18 16:47:38 +02:00 committed by Matt Clay
parent 8874c1dc39
commit 0e834fc9e4
251 changed files with 214 additions and 510 deletions

View file

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

View file

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

View file

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

View file

@ -70,7 +70,7 @@
- name: kv test - name: kv test
assert: assert:
that: that:
- "{{item | match('somevalue_one')}}" - "{{item | match('somevalue_one')}}"
with_consul_kv: with_consul_kv:
- 'key/to/lookup_one token={{acl_token}}' - 'key/to/lookup_one token={{acl_token}}'
@ -78,7 +78,7 @@
- name: recursive kv lookup test - name: recursive kv lookup test
assert: assert:
that: that:
- "{{item| match('somevalue_(one|two)')}}" - "{{item| match('somevalue_(one|two)')}}"
with_consul_kv: with_consul_kv:
- 'key/to recurse=true token={{acl_token}}' - 'key/to recurse=true token={{acl_token}}'

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -103,12 +103,12 @@
- name: Setup nginx with a user/password - name: Setup nginx with a user/password
copy: copy:
src: docker-registry.htpasswd src: docker-registry.htpasswd
dest: /etc/nginx/docker-registry.htpasswd dest: /etc/nginx/docker-registry.htpasswd
- name: Setup nginx with a config file - name: Setup nginx with a config file
copy: copy:
src: nginx-docker-registry.conf src: nginx-docker-registry.conf
dest: /etc/nginx/conf.d/nginx-docker-registry.conf dest: /etc/nginx/conf.d/nginx-docker-registry.conf
- name: Setup nginx docker cert - name: Setup nginx docker cert
copy: copy:
@ -186,4 +186,3 @@
line: "127.0.0.1 dockertest.ansible.com" line: "127.0.0.1 dockertest.ansible.com"
dest: /etc/hosts dest: /etc/hosts
state: absent state: absent

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,2 +1 @@
dependencies: [] dependencies: []

View file

@ -38,4 +38,3 @@
shell: echo shell: echo
notify: notify:
- set_handler_fact_2 - set_handler_fact_2

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,2 +1 @@
- include: more_handlers.yml - include: more_handlers.yml

View file

@ -10,5 +10,3 @@
- "ca == 4001" - "ca == 4001"
- "cb == 4002" - "cb == 4002"
- "cc == 4003" - "cc == 4003"

View file

@ -7,4 +7,3 @@
- set_fact: - set_fact:
cc: "{{ c }}" cc: "{{ c }}"
- debug: var=cc - debug: var=cc

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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