Skip to content

Commit

Permalink
Merge pull request #297 from ripleymj/fix-lint-warnings
Browse files Browse the repository at this point in the history
Fix or squelch ansible-lint warnings
  • Loading branch information
ripleymj authored Aug 16, 2019
2 parents d47ac73 + 0c19a7c commit 578164a
Show file tree
Hide file tree
Showing 59 changed files with 151 additions and 95 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
skip_list:
# Package installs should not use latest
- 403
2 changes: 1 addition & 1 deletion roles/adv-prog-pkgs/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for adv-prog-pkgs
# defaults file for adv-prog-pkgs
2 changes: 1 addition & 1 deletion roles/adv-prog-pkgs/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for adv-prog-pkgs
# handlers file for adv-prog-pkgs
7 changes: 6 additions & 1 deletion roles/adv-prog-pkgs/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the advanced programming packages generally used in CS261
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []
2 changes: 1 addition & 1 deletion roles/adv-prog-pkgs/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- adv-prog-pkgs
- adv-prog-pkgs
2 changes: 1 addition & 1 deletion roles/basic-prog-pkgs/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for basic-prog-pkgs
# defaults file for basic-prog-pkgs
2 changes: 1 addition & 1 deletion roles/basic-prog-pkgs/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for basic-prog-pkgs
# handlers file for basic-prog-pkgs
8 changes: 6 additions & 2 deletions roles/basic-prog-pkgs/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the basic programming packages used throughout the CS program
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

2 changes: 1 addition & 1 deletion roles/basic-prog-pkgs/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- basic-prog-pkgs
- basic-prog-pkgs
2 changes: 1 addition & 1 deletion roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for common
# defaults file for common
2 changes: 1 addition & 1 deletion roles/common/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for common
# handlers file for common
5 changes: 5 additions & 0 deletions roles/common/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the shortcuts to easily re-run the VM tasks
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
Expand Down
46 changes: 25 additions & 21 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,57 @@
# All tasks in this file should be able to be run as part of the OEM or common
# role without error as common is used in both of those.

- set_fact:
- name: Set OEM facts
set_fact:
base_path: "{{ oem_base_path }}"
icon_path: "/etc/skel/Desktop"
file_mode: 0755
when: icon_mode == 'oem'
- set_fact:
- name: Set user facts
set_fact:
base_path: "{{ global_base_path }}"
icon_path: "/usr/local/share/applications"
file_mode: 0644
when: icon_mode == 'user'
- set_fact: bin_path="{{ base_path }}/vmtools/bin"
- set_fact: uug_ansible_wrapper="{{ bin_path }}/uug_ansible_wrapper.py"
- name: Set bin fact
set_fact: bin_path="{{ base_path }}/vmtools/bin"
- name: Set wrapper fact
set_fact: uug_ansible_wrapper="{{ bin_path }}/uug_ansible_wrapper.py"
- name: Check Ubuntu release
set_fact:
ubuntu_release: "{{ lookup('ini', 'UBUNTU_CODENAME type=properties file=/etc/os-release') }}"

- name: Create VMTools bin
file:
path: "{{ bin_path }}"
state: directory
path: "{{ bin_path }}"
state: directory
- name: Ensure desktop icon directory exists
file:
path: "{{ icon_path }}"
state: directory
mode: 0755
path: "{{ icon_path }}"
state: directory
mode: 0755
# The policy file must go in /usr/share/polkit-1. It is the only location that
# policykit checks
- name: Install policykit policy for Ansible wrapper
copy:
src: edu.jmu.uug.ansiblewrapper.policy
dest: /usr/share/polkit-1/actions/
mode: 0644
src: edu.jmu.uug.ansiblewrapper.policy
dest: /usr/share/polkit-1/actions/
mode: 0644
- name: Install Ansible wrapper GUI script
copy:
src: uug_ansible_wrapper.py
dest: '{{ uug_ansible_wrapper }}'
mode: 0755
src: uug_ansible_wrapper.py
dest: '{{ uug_ansible_wrapper }}'
mode: 0755
- name: Install JMU Tux icon
copy:
src: jmu-tux.svg
dest: "{{ base_path }}/jmu-tux.svg"
mode: 0644
src: jmu-tux.svg
dest: "{{ base_path }}/jmu-tux.svg"
mode: 0644
- name: Copy shortcut to desktop file directory
template:
src: desktop-template.desktop.j2
dest: "{{ icon_path }}/jmucs_config.desktop"
mode: "{{ file_mode }}"
src: desktop-template.desktop.j2
dest: "{{ icon_path }}/jmucs_config.desktop"
mode: "{{ file_mode }}"

- name: Set Ubuntu mirrors
template:
Expand Down
2 changes: 1 addition & 1 deletion roles/common/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- common
- common
2 changes: 1 addition & 1 deletion roles/eclipse/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for eclipse
# defaults file for eclipse
2 changes: 1 addition & 1 deletion roles/eclipse/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for eclipse
# handlers file for eclipse
8 changes: 6 additions & 2 deletions roles/eclipse/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the Eclipse IDE
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

2 changes: 1 addition & 1 deletion roles/eclipse/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- eclipse
- eclipse
2 changes: 1 addition & 1 deletion roles/filezilla/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for filezilla
# defaults file for filezilla
2 changes: 1 addition & 1 deletion roles/filezilla/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for filezilla
# handlers file for filezilla
8 changes: 6 additions & 2 deletions roles/filezilla/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs Filezilla
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

1 change: 0 additions & 1 deletion roles/filezilla/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@
# Don't overwrite any filters the user already has
force: no
loop: "{{ real_users }}"

2 changes: 1 addition & 1 deletion roles/filezilla/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- filezilla
- filezilla
2 changes: 1 addition & 1 deletion roles/finch/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for finch
# defaults file for finch
2 changes: 1 addition & 1 deletion roles/finch/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for finch
# handlers file for finch
8 changes: 6 additions & 2 deletions roles/finch/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the tools and scripts needed to use the Finch robots in CS101
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

2 changes: 1 addition & 1 deletion roles/finch/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- finch
- finch
2 changes: 1 addition & 1 deletion roles/jgrasp/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# defaults file for jgrasp
# defaults file for jgrasp
2 changes: 1 addition & 1 deletion roles/jgrasp/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
# handlers file for jgrasp
# handlers file for jgrasp
8 changes: 6 additions & 2 deletions roles/jgrasp/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Installs the jGRASP IDE
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

2 changes: 1 addition & 1 deletion roles/jgrasp/tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- jgrasp
- jgrasp
8 changes: 6 additions & 2 deletions roles/oem/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
galaxy_info:
author: Unix Users Group
description: Performs the configuration necessary on the VM before it is distributed
company: James Madison University
license: MIT
min_ansible_version: 2.1
github_branch: master
platforms:
- name: Ubuntu
versions:
- bionic
galaxy_tags: []
# List tags for your role here, one per line. A tag is a keyword that describes
# and categorizes the role. Users find roles by searching for tags. Be sure to
# remove the '[]' above, if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of alphanumeric characters.
# Maximum 20 tags per role.
#TODO Add common as a dependency
# TODO Add common as a dependency
dependencies: []

2 changes: 1 addition & 1 deletion roles/oem/tasks/vm_only_post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# The USB 2/3 controllers are only available with the Virtualbox
# Extensions which are non-free software and available only under the Oracle
# PUEL. We should ensure we have not accidentally included them.
- name: Validate missing USB 2/3 controllers
- name: Validate missing USB 2/3 controllers # noqa 306
shell: lspci | grep -i -e EHCI -e xHCI
register: lspci_output
failed_when: lspci_output.rc == 0
Expand Down
Loading

0 comments on commit 578164a

Please sign in to comment.