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

@ -1,8 +1,8 @@
---
- hosts: localhost
connection: local
gather_facts: no
tags:
- hosts: localhost
connection: local
gather_facts: no
tags:
- cloudflare
roles:
- { role: test_cloudflare_dns, tags: test_cloudflare_dns }
roles:
- { role: test_cloudflare_dns, tags: test_cloudflare_dns }

View file

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

View file

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

View file

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

View file

@ -1,8 +1,8 @@
---
######## NS record tests #################
# the '.' at the end of the value is intentional
# it must be verified that the '.' will be stripped
# the '.' at the end of the value is intentional
# it must be verified that the '.' will be stripped
- name: "Test: NS record creation"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"

View file

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

View file

@ -13,7 +13,7 @@
consul:
check_id: '{{item}}'
state: absent
with_items:
with_items:
- node_level
- node_level_http

View file

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

View file

@ -5,7 +5,7 @@
end_port: 8888
cidr: 1.2.3.4/32
register: sg_rule
- name: verify create http range rule
- name: verify create http range rule
assert:
that:
- sg_rule|success

View file

@ -38,7 +38,7 @@
- name: test replace ssh public key
cs_sshkeypair: |
name={{ cs_resource_prefix }}-sshkey
name={{ cs_resource_prefix }}-sshkey
public_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey3
- name: verify results of replace ssh public key
@ -52,7 +52,7 @@
- name: test replace ssh public key idempotence
cs_sshkeypair: |
name={{ cs_resource_prefix }}-sshkey
name={{ cs_resource_prefix }}-sshkey
public_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey4
- name: verify results of ssh public key idempotence

View file

@ -89,10 +89,10 @@
load_balancer_port: 80
instance_port: 80
health_check:
ping_protocol: http
ping_protocol: http
ping_port: 80
ping_path: "/"
response_timeout: 5
response_timeout: 5
interval: 30
unhealthy_threshold: 3
healthy_threshold: 3
@ -125,7 +125,7 @@
- "output.viable_instances == 1"
# grow scaling group to 3
# grow scaling group to 3
- name: add 2 more instances wait for instances to be deemed healthy (ELB)
ec2_asg:
@ -207,4 +207,4 @@
ec2_secret_key: "{{ ec2_secret_key }}"
region: "{{ ec2_region }}"
state: absent
async: 300
async: 300

View file

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

View file

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

View file

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

View file

@ -217,4 +217,3 @@
that:
- 'result.failed'
- '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"
machine_type: f1-micro
image: debian-8

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -57,7 +57,7 @@
- "'finished' not in async_result or async_result.finished == 0"
- name: test skipped task handling
command: /bin/true
command: /bin/true
async: 15
poll: 0
when: False

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -23,7 +23,7 @@
- debug: var=shell_result
- name: changed should always be true for shell
assert:
assert:
that:
- "shell_result.changed"
@ -35,8 +35,6 @@
- debug: var=shell_result
- name: changed should be false
assert:
assert:
that:
- "not shell_result.changed"

View file

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

View file

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

View file

@ -20,7 +20,7 @@
shell: echo 'testing'
when: 1 == 1
register: result
- name: assert conditional '==' ran
assert:
that:

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,3 +1,2 @@
---
- { 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.
- include: 'dnf.yml'
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
# Note: add docker-registry when available
name: docker.io,python-docker,netcat-openbsd,nginx

View file

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

View file

@ -103,12 +103,12 @@
- name: Setup nginx with a user/password
copy:
src: docker-registry.htpasswd
dest: /etc/nginx/docker-registry.htpasswd
dest: /etc/nginx/docker-registry.htpasswd
- name: Setup nginx with a config file
copy:
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
copy:
@ -186,4 +186,3 @@
line: "127.0.0.1 dockertest.ansible.com"
dest: /etc/hosts
state: absent

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -22,12 +22,12 @@
- shell: echo "[general]" > {{ fact_dir }}/preferences.fact
- shell: echo "bar=loaded" >> {{ fact_dir }}/preferences.fact
- setup:
fact_path: "{{ fact_dir | expanduser }}"
- setup:
fact_path: "{{ fact_dir | expanduser }}"
filter: "*local*"
register: setup_result
- debug: var=setup_result
- debug: var=setup_result
- assert:
that:

View file

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

View file

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

View file

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

View file

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

View file

@ -108,7 +108,7 @@
- name: touch a hard link
file: src={{output_file}} dest={{output_dir}}/hard.txt state=touch
register: file6_touch_result
register: file6_touch_result
- name: verify that the hard link was touched
assert:

View file

@ -27,4 +27,4 @@
- "file_se_result.secontext == 'unconfined_u:object_r:admin_home_t:s0'"
- name: remove the file used for testing
file: path={{output_dir}}/foo-se.txt state=absent
file: path={{output_dir}}/foo-se.txt state=absent

View file

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

View file

@ -109,4 +109,3 @@
assert:
that:
- "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_mounts|default("UNDEF_HW") == "UNDEF_HW"'
- 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'

View file

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

View file

@ -23,18 +23,17 @@
shell: gem list | egrep '^gist '
register: uninstall
failed_when: "uninstall.rc != 1"
- name: install a gem
gem: name=gist state=present
register: gem_result
- name: verify module output properties
assert:
that:
assert:
that:
- "'name' in gem_result"
- "'changed' in gem_result"
- "'state' in gem_result"
- "'changed' in gem_result"
- "'state' in gem_result"
- name: verify gist is installed
shell: gem list | egrep '^gist '
shell: gem list | egrep '^gist '

View file

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

View file

@ -37,15 +37,15 @@
geturl_dstfile: "{{ output_dir | expanduser }}/aurlfile_copy.txt"
- name: Create source file
copy:
dest: "{{ geturl_srcfile }}"
content: "foobar"
copy:
dest: "{{ geturl_srcfile }}"
content: "foobar"
- name: test file fetch
get_url:
url: "{{ 'file://' + geturl_srcfile }}"
dest: "{{ geturl_dstfile }}"
register: result
dest: "{{ geturl_dstfile }}"
register: result
- name: assert success and change
assert:
@ -56,8 +56,8 @@
- name: test nonexisting file fetch
get_url:
url: "{{ 'file://' + geturl_srcfile + 'NOFILE' }}"
dest: "{{ geturl_dstfile + 'NOFILE' }}"
register: result
dest: "{{ geturl_dstfile + 'NOFILE' }}"
register: result
ignore_errors: True
- name: assert success and change

View file

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

View file

@ -1,2 +1,2 @@
- name: echoing handler
command: echo CALLED_HANDLER_{{ inventory_hostname }}
command: echo CALLED_HANDLER_{{ inventory_hostname }}

View file

@ -21,6 +21,6 @@
- name: EXPECTED FAILURE fail task for C
fail: msg="Fail C"
when: inventory_hostname == 'C'
- name: echo after A and C have failed
command: echo CALLED_TASK_{{ inventory_hostname }}
command: echo CALLED_TASK_{{ inventory_hostname }}

View file

@ -1,5 +1,5 @@
- name: set handler fact
set_fact:
set_fact:
handler_called: True
- name: test handler
debug: msg="handler called"

View file

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

View file

@ -24,7 +24,7 @@
- name: notify the handler for host A only
shell: echo
notify:
notify:
- set handler fact
when: inventory_hostname == 'A'
tags: scenario1

View file

@ -1,5 +1,5 @@
- name: set_handler_fact_1
set_fact:
set_fact:
handler1_called: True
- name: set_handler_fact_2

View file

@ -18,13 +18,13 @@
- name: notify the first handler
shell: echo
notify:
notify:
- set_handler_fact_1
- name: force handler execution now
meta: "flush_handlers"
- name: assert handler1 ran and not handler2
- name: assert handler1 ran and not handler2
assert:
that:
- "handler1_called is defined"
@ -36,6 +36,5 @@
- name: notify the second handler
shell: echo
notify:
notify:
- set_handler_fact_2

View file

@ -12,7 +12,7 @@
connection: local
tasks:
- name: verify handler2 ran
assert:
assert:
that:
- "not hostvars[inventory_hostname]['handler1_called']"
- "'handler2_called' in hostvars[inventory_hostname]"

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