openstack/openstack-ansible
Code Issues Proposed changes

Avoid using 'roles' reserved variable

Browse Source 
This patch clears up an Ansible warning that is thrown each time the
`get-ansible-role-requirements.yml` playbook runs. The playbook has
a variable called `roles`, but that's a reserved variable name.

The patch changes the variable name to `required_roles` to avoid the
warning.

Closes-Bug: 1735781
Change-Id: I91e5505408e53271155ac80e2997595ddf3b8781
This commit is contained in:
Major Hayden
2017-12-01 10:07:25 -06:00
parent 6dda7dcbd0
commit 98d1b58b94
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/get-ansible-role-requirements.yml
View File

@@ -27,7 +27,7 @@
executable: /bin/bash executable: /bin/bash
when: when:
- item.scm == "git" or item.scm is undefined - item.scm == "git" or item.scm is undefined
with_items: "{{ roles }}" with_items: "{{ required_roles }}"
- name: Ensure the default roles directory exists - name: Ensure the default roles directory exists
file: file:
@@ -42,7 +42,7 @@
register: zuul_roles register: zuul_roles
when: when:
- item.scm == "git" or item.scm is undefined - item.scm == "git" or item.scm is undefined
with_items: "{{ roles }}" with_items: "{{ required_roles }}"
- name: Link the Zuul provided roles - name: Link the Zuul provided roles
file: file:
src: "/home/zuul/src/{{ item.item.src.split('/')[-3:] | join('/') }}" src: "/home/zuul/src/{{ item.item.src.split('/')[-3:] | join('/') }}"
@@ -91,7 +91,7 @@
vars: vars:
ansible_python_interpreter: "/usr/bin/python" ansible_python_interpreter: "/usr/bin/python"
roles: "{{ lookup('file', role_file) | from_yaml }}" required_roles: "{{ lookup('file', role_file) | from_yaml }}"
role_file: '../ansible-role-requirements.yml' role_file: '../ansible-role-requirements.yml'
role_path_default: '/etc/ansible/roles' role_path_default: '/etc/ansible/roles'
git_clone_retries: 2 git_clone_retries: 2