Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] ansible-lint: Doesn’t need a relative path in role #4508

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ skip_list:
- '303'
- '305'
- '306'
- '404'
- '502'
- '503'
- '504'
Expand Down
4 changes: 2 additions & 2 deletions roles/network_plugin/contiv/tasks/pre-reset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

- name: reset | Copy contiv temporary cleanup script
copy:
src: ../files/contiv-cleanup.sh # Not in role_path so we must trick...
src: contiv-cleanup.sh
dest: /opt/cni/bin/cleanup
owner: root
group: root
Expand All @@ -33,7 +33,7 @@

- name: reset | Lay down contiv cleanup template
template:
src: ../templates/contiv-cleanup.yml.j2 # Not in role_path so we must trick...
src: contiv-cleanup.yml.j2
dest: "{{ kube_config_dir }}/contiv-cleanup.yml" # kube_config_dir is used here as contiv_config_dir is not necessarily set at reset
register: contiv_cleanup_manifest
when:
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud_playbooks/create-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

- name: Template the inventory
template:
src: ../templates/inventory-aws.j2
src: inventory-aws.j2
dest: "{{ inventory_path }}"

- name: Wait until SSH is available
Expand Down
2 changes: 1 addition & 1 deletion tests/cloud_playbooks/create-do.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

- name: Template the inventory
template:
src: ../templates/inventory-do.j2
src: inventory-do.j2
dest: "{{ inventory_path }}"
when: state == 'present'

Expand Down
4 changes: 2 additions & 2 deletions tests/cloud_playbooks/create-gce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

- name: Template the inventory
template:
src: ../templates/inventory-gce.j2
src: inventory-gce.j2
dest: "{{ inventory_path }}"

- name: Make group_vars directory
Expand All @@ -61,7 +61,7 @@

- name: Template fake hosts group vars
template:
src: ../templates/fake_hosts.yml.j2
src: fake_hosts.yml.j2
dest: "{{ inventory_path|dirname }}/group_vars/fake_hosts.yml"
when: mode in ['scale', 'separate-scale', 'ha-scale']

Expand Down