Skip to content

Commit 154385c

Browse files
authored
apply fix for lint (#39)
1 parent 99aad44 commit 154385c

File tree

52 files changed

+78
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+78
-92
lines changed

.github/workflows/lint.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v2
1212

13-
- name: Lint Ansible Playbook
14-
uses: ansible/ansible-lint-action@master
15-
with:
16-
targets: |
17-
playbook-devel.yml
18-
override-deps: |
19-
ansible-lint==5.1.2
20-
args: ""
21-
continue-on-error: true
13+
- name: Lint Ansible Playbook
14+
uses: ansible/ansible-lint-action@main
15+
with:
16+
targets: |
17+
playbook-devel.yml
18+
override-deps: |
19+
ansible-lint==5.1.2
20+
args: ""
21+
continue-on-error: true

.yamllint

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
extends: default
2+
3+
rules:
4+
braces:
5+
min-spaces-inside: 0
6+
max-spaces-inside: 1
7+
comments-indentation: false
8+
document-start: disable
9+
empty-lines:
10+
max: 2
11+
max-start: 0
12+
max-end: 0
13+
line-length:
14+
max: 160
15+
truthy:
16+
allowed-values: ["true", "false", "yes", "no"]

playbook-devel.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- hosts: all
44
roles:
5-
- { role: apt, tags: apt, APT_DEVTOOL: True }
5+
- { role: apt, tags: apt, APT_DEVTOOL: true }
66
- { role: build-essential, tags: build-essential }
77
- { role: git, tags: git, GIT_INSTALLER: 'extra' }
88
- { role: shell, tags: shell, SHELL_TYPE: 'bash' }

playbook-gitlab.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/prepare.md
66
- hosts: all
77
roles:
8-
- { role: git, tags: git, GIT_INSTALLER: 'extra' }
8+
- { role: git, tags: git, GIT_INSTALLER: 'extra' }
99
- { role: ruby, tags: ruby, RUBY_VERSION: 2.5.3 }
1010
- { role: golang, tags: golang }
1111
- { role: nodejs, tags: nodejs, NODEJS_MAJOR_VERSION: 8 }

roles/ansible/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
---
22

33
- include: install_{{ ansible_distribution }}.yml
4-

roles/apt/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ APT_MIRROR_URL: 'http://jp.archive.ubuntu.com/ubuntu/'
55

66
# 開発環境向けカスタマイズの適用有無
77
# apt-fileのインストール
8-
APT_DEVTOOL: False
8+
APT_DEVTOOL: false

roles/apt/vars/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22

33
# 書き換え対象とするリポジトリURL
44
APT_REPOSITORY_URL: 'http://jp.archive.ubuntu.com/ubuntu/'
5-

roles/asunder/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
- name: asunder | install asunder
88
become: yes
99
apt: name='asunder'
10-

roles/build-essential/tasks/kernel_param.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
name: fs.inotify.max_user_watches
77
value: '524288'
88
reload: yes
9-

roles/build-essential/tasks/main.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
name: "{{ packages }}"
1212
vars:
1313
packages:
14-
- automake
15-
- make
16-
- texinfo
17-
- unzip
18-
- jq
19-
- libmysqlclient-dev
20-
- sysstat
14+
- automake
15+
- make
16+
- texinfo
17+
- unzip
18+
- jq
19+
- libmysqlclient-dev
20+
- sysstat
2121

2222
- include_tasks: kernel_param.yml
-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
---
22

33
DOCKER_APP_VERSION: 0.1
4-

roles/docker/tasks/configure_Ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
template:
1313
src: daemon.json.j2
1414
dest: /etc/docker/daemon.json
15-
trim_blocks: False
15+
trim_blocks: false

roles/dropbox/tasks/dropbox_ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020

2121
- name: dropbox | be sure dropbox autostart on login
2222
command: dropbox autostart y
23-
when: not autostart.stat.exists
23+
when: not autostart.stat.exists

roles/emacs/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
- name: emacs | be sure my dot emacs is copied from github
1313
git: repo=https://github.com/thaim/dot.emacs.d
1414
dest={{ ansible_env.HOME }}/.emacs.d
15-
when: not result.stat.exists
15+
when: not result.stat.exists

roles/english_path/tasks/main.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
insertafter="{{ item.insertafter }}"
77
line="{{ item.line }}"
88
with_items:
9+
# yamllint disable rule:commas
910
- { regexp: '^XDG_DESKTOP_DIR', line: 'XDG_DESKTOP_DIR=\"$HOME/Desktop\"', insertafter: EOF }
1011
- { regexp: '^XDG_DOWNLOAD_DIR', line: 'XDG_DOWNLOAD_DIR=\"$HOME/Download\"', insertafter: EOF }
1112
- { regexp: '^XDG_TEMPLATES_DIR', line: 'XDG_TEMPLATES_DIR=\"$HOME/Template\"', insertafter: EOF }
@@ -20,11 +21,11 @@
2021
shell: |
2122
if [ -d {{ ansible_env.HOME }}/{{ item.before }} ]; then mv {{ ansible_env.HOME }}/{{ item.before }} {{ ansible_env.HOME }}/{{ item.after }}; fi
2223
with_items:
23-
- { before: 'デスクトップ', after: 'Desktop' }
24-
- { before: 'ダウンロード', after: 'Download' }
25-
- { before: 'テンプレート', after: 'Template' }
26-
- { before: '公開', after: 'Public' }
24+
- { before: 'デスクトップ', after: 'Desktop' }
25+
- { before: 'ダウンロード', after: 'Download' }
26+
- { before: 'テンプレート', after: 'Template' }
27+
- { before: '公開', after: 'Public' }
2728
- { before: 'ドキュメント', after: 'Documents' }
28-
- { before: 'ミュージック', after: 'Music' }
29-
- { before: 'ピクチャ', after: 'Pictures' }
30-
- { before: 'ビデオ', after: 'Videos' }
29+
- { before: 'ミュージック', after: 'Music' }
30+
- { before: 'ピクチャ', after: 'Pictures' }
31+
- { before: 'ビデオ', after: 'Videos' }

roles/fonts/tasks/ricty.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
copy:
4141
src: "{{ workdir.path }}/{{ item.src }}"
4242
dest: "{{ workdir.path }}/{{ item.dest }}"
43-
remote_src: True
43+
remote_src: true
4444
with_items:
45+
# yamllint disable rule:commas
4546
- { src: "migu-1m-20150712/migu-1m-regular.ttf", dest: "migu-1m-regular.ttf" }
4647
- { src: "migu-1m-20150712/migu-1m-bold.ttf", dest: "migu-1m-bold.ttf" }
4748

roles/ghq/meta/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

33
dependencies:
4-
- role: golang
5-
vars:
6-
GOLANG_INSTALL_DEVTOOLS: false
4+
- role: golang
5+
vars:
6+
GOLANG_INSTALL_DEVTOOLS: false

roles/gibo/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88

99
- name: gibo | initialize gibo and creaqte local gitignore files
1010
command: "{{ ansible_user_dir }}/bin/gibo update"
11-

roles/golang/tasks/configure_Ubuntu.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
line: "{{ item.line }}"
99
create: yes
1010
with_items:
11+
# yamllint disable rule:commas
1112
- { regexp: '^export PATH="\$PATH:/usr/local/go/bin"', line: 'export PATH="$PATH:/usr/local/go/bin"', insertafter: EOF }
12-
- { regexp: '^export GOPATH=', line: 'export GOPATH="{{ GOLANG_GOPATH }}"', insertafter: EOF }
13-
- { regexp: '^export PATH="\$PATH:\$GOPATH/bin"', line: 'export PATH="$PATH:$GOPATH/bin"', insertafter: EOF }
13+
- { regexp: '^export GOPATH=', line: 'export GOPATH="{{ GOLANG_GOPATH }}"', insertafter: EOF }
14+
- { regexp: '^export PATH="\$PATH:\$GOPATH/bin"', line: 'export PATH="$PATH:$GOPATH/bin"', insertafter: EOF }

roles/intellij/tasks/IntelliJ.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
workdir: /tmp/ideaIC-{{ INTELLIJ_VERSION }}
44

5-
65
- name: intellij | create working directory if not exists
76
file:
87
path: {{ workdir }}

roles/kubectl/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
kubectl_install_extra: True
3+
kubectl_install_extra: true
44

55
kubectl_kubectx_version: v0.6.1
66

roles/kubectl/tasks/main.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
---
32

43
- include_tasks: install_{{ ansible_distribution }}.yml
54

65
- include_tasks: install_extra.yml
7-
when: kubectl_install_extra == True
6+
when: kubectl_install_extra | bool

roles/lha/tasks/main.yml

-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
sudo: yes
55
apt: name=lha-sjis
66
state=latest
7-
8-
9-

roles/mendeley_desktop/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99
sudo: yes
1010
apt: name=mendeleydesktop
1111
state=latest
12-

roles/mercurial/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
- name: mercurial | install mercurial
44
sudo: yes
5-
apt: name=mercurial
5+
apt: name=mercurial

roles/opennebula/handlers/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
service:
66
name: libvirt-bin
77
state: restarted
8-

roles/opennebula/tasks/install_host.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
apt:
66
name: 'opennebula-node'
77
notify: restart libvirt-bin
8-

roles/opennebula/vars/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ OPENNEBULA_VERSION: 5.4
44

55
# 'host' or 'front'
66
OPENNEBULA_ROLE: 'host'
7-

roles/openshift-client/tasks/install_CentOS.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
- name: openshift-client | download openshift client archive
44
get_url:
5-
url: "{{ OPENSHIFT_CLIENT_RELEASE_URL }}/v{{ OPENSHIFT_VERSION }}/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz"
5+
url: "{{ OPENSHIFT_CLIENT_RELEASE_URL }}/v{{ OPENSHIFT_VERSION }}/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz" # yamllint disable-line rule:line-length
66
dest: /tmp/
77
with_items:
88
- "{{ OPENSHIFT_VERSION }}"
99

1010
- name: openshift-client | unarchive installer
1111
unarchive:
12-
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz"
12+
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz" # yamllint disable-line rule:line-length
1313
dest: /tmp/
1414
remote_src: yes
1515
with_items:
@@ -18,7 +18,7 @@
1818
- name: openshift-client | copy binary file
1919
become: yes
2020
copy:
21-
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit/oc"
21+
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit/oc" # yamllint disable-line rule:line-length
2222
dest: /usr/local/bin/
2323
remote_src: yes
2424
mode: 0755

roles/openshift-client/tasks/install_Ubuntu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
- name: openshift-client | download openshift client archive
44
get_url:
5-
url: "{{ OPENSHIFT_CLIENT_RELEASE_URL }}/v{{ OPENSHIFT_VERSION }}/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz"
5+
url: "{{ OPENSHIFT_CLIENT_RELEASE_URL }}/v{{ OPENSHIFT_VERSION }}/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz" # yamllint disable-line rule:line-length
66
dest: /tmp/
77
with_items:
88
- "{{ OPENSHIFT_VERSION }}"
99

1010

1111
- name: openshift-client | unarchive installer
1212
unarchive:
13-
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz"
13+
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit.tar.gz" # yamllint disable-line rule:line-length
1414
dest: /tmp/
1515
remote_src: yes
1616
with_items:
@@ -19,7 +19,7 @@
1919
- name: openshift-client | copy binary file
2020
become: yes
2121
copy:
22-
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit/oc"
22+
src: "/tmp/openshift-origin-client-tools-v{{ OPENSHIFT_VERSION }}-{{ OPENSHIFT_CLI_HASH[item] }}-linux-64bit/oc" # yamllint disable-line rule:line-length
2323
dest: /usr/local/bin/
2424
remote_src: yes
2525
mode: 0755

roles/openstack-client/meta/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22

33
dependencies:
4-
- pip-pip3
4+
- pip-pip3

roles/python/meta/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22

33
dependencies:
4-
- pip-pip3
4+
- pip-pip3

roles/redis/tasks/install_Ubuntu.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22

3-
43
- name: redis | install redis
54
become: yes
65
apt:
76
name: redis
8-

roles/redis/tasks/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22

3-
43
- name: redis | check if redis already installed
54
command: which redis
65
changed_when: false
@@ -9,4 +8,3 @@
98

109
- include_tasks: install_{{ ansible_distribution }}.yml
1110
when: redis_status.rc != 0
12-

roles/ruby/tasks/common_gems.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
name: bundler
44
state: latest
55
executable: "{{ ansible_env.HOME }}/.rbenv/shims/gem"
6-
user_install: False
6+
user_install: false

roles/ruby/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
shell: "{{ ansible_env.HOME }}/.rbenv/bin/rbenv versions | grep -c {{ RUBY_VERSION }}"
1616
register: ruby_ver
1717
changed_when: false
18-
failed_when: false
18+
failed_when: false
1919
when: ruby_stat.stat.exists
2020

2121
# 関連ライブラリのインストール

roles/ruby/tasks/rbenv.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
regexp: "{{ item.regexp }}"
1818
insertafter: "{{ item.insertafter }}"
1919
with_items:
20+
# yamllint disable rule:commas
2021
- { line: 'export PATH="$HOME/.rbenv/bin:$PATH"', regexp: '^export PATH=\"\$HOME/.rbenv/bin:\$PATH\"', insertafter: EOF }
2122
- { line: 'eval "$(rbenv init -)"', regexp: '^eval \"\$\(rbenv init -\)\"', insertafter: EOF }
22-

roles/rubymine/tasks/install.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@
1818
line: 'export PATH="$PATH:/usr/local/RubyMine-{{ RUBYMINE_VERSION }}/bin"'
1919
regexp: '^export PATH="\$PATH:/usr/local/RubyMine"'
2020
insertafter: EOF
21-

roles/samba/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@
2020
sudo: yes
2121
service: state=started
2222
enabled=yes
23-

roles/secure-sshd/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
- name: secure-sshd | copy authorized_key
44
authorized_key: user="{{ USER_NAME }}"
55
key="{{ lookup('file', '' }}"
6-

roles/selinux/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
---
12

23
- include: CentOS7.yml
3-
when: ansible_distribution == 'CentOS'
4-
4+
when: ansible_distribution == 'CentOS'

roles/shell/tasks/configure_bashrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
- name: shell | setup git prompt
1616
blockinfile:
1717
path: "{{ ansible_user_dir }}/.bashrc"
18+
# yamllint disable rule:line-length
1819
block: |
1920
GIT_PS1_SHOWDIRTYSTATE=true
2021
GIT_PS1_SHOWUPSTREAM=true
2122
export PS1='\[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[1;31m\]$(__git_ps1 " (%s)")\[\033[00m\]\n\$ '
22-

roles/sphinx/meta/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22

33
dependencies:
4-
- pip-pip3
4+
- pip-pip3

0 commit comments

Comments
 (0)