style(syntax): resolve linting errors+warnings
Resolve all rubocop, salt-lint and yamllint complaints. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
4b5887a1f0
commit
ad7db1c78f
GPG Key ID:
1ED2F138E7E6FF57
68
kitchen.yml
68
kitchen.yml
@ -283,10 +283,10 @@ platforms:
|
||||
- name: ubuntu-1604-3000-8-py2
|
||||
driver:
|
||||
image: saltimages/salt-3000.8-py2:ubuntu-16.04
|
||||
# - name: arch-base-latest-3000-8-py2
|
||||
# driver:
|
||||
# image: saltimages/salt-3000.8-py2:arch-base-latest
|
||||
# run_command: /usr/lib/systemd/systemd
|
||||
# - name: arch-base-latest-3000-8-py2
|
||||
# driver:
|
||||
# image: saltimages/salt-3000.8-py2:arch-base-latest
|
||||
# run_command: /usr/lib/systemd/systemd
|
||||
|
||||
provisioner:
|
||||
name: salt_solo
|
||||
@ -336,33 +336,33 @@ suites:
|
||||
verifier:
|
||||
inspec_tests:
|
||||
- path: test/integration/default
|
||||
# - name: gentoo
|
||||
# includes:
|
||||
# - gentoo-stage3-latest-master-py3
|
||||
# - gentoo-stage3-systemd-master-py3
|
||||
# - gentoo-stage3-latest-3002-5-py3
|
||||
# - gentoo-stage3-systemd-3002-5-py3
|
||||
# - gentoo-stage3-latest-3001-6-py3
|
||||
# - gentoo-stage3-systemd-3001-6-py3
|
||||
# - gentoo-stage3-latest-3000-8-py3
|
||||
# - gentoo-stage3-systemd-3000-8-py3
|
||||
# provisioner:
|
||||
# state_top:
|
||||
# base:
|
||||
# '*':
|
||||
# - nsd._mapdata
|
||||
# - nsd
|
||||
# pillars:
|
||||
# top.sls:
|
||||
# base:
|
||||
# '*':
|
||||
# - nsd
|
||||
# - gentoo
|
||||
# - define_roles
|
||||
# pillars_from_files:
|
||||
# nsd.sls: pillar.example
|
||||
# gentoo.sls: test/salt/pillar/gentoo.sls
|
||||
# define_roles.sls: test/salt/pillar/define_roles.sls
|
||||
# verifier:
|
||||
# inspec_tests:
|
||||
# - path: test/integration/default
|
||||
# - name: gentoo
|
||||
# includes:
|
||||
# - gentoo-stage3-latest-master-py3
|
||||
# - gentoo-stage3-systemd-master-py3
|
||||
# - gentoo-stage3-latest-3002-5-py3
|
||||
# - gentoo-stage3-systemd-3002-5-py3
|
||||
# - gentoo-stage3-latest-3001-6-py3
|
||||
# - gentoo-stage3-systemd-3001-6-py3
|
||||
# - gentoo-stage3-latest-3000-8-py3
|
||||
# - gentoo-stage3-systemd-3000-8-py3
|
||||
# provisioner:
|
||||
# state_top:
|
||||
# base:
|
||||
# '*':
|
||||
# - nsd._mapdata
|
||||
# - nsd
|
||||
# pillars:
|
||||
# top.sls:
|
||||
# base:
|
||||
# '*':
|
||||
# - nsd
|
||||
# - gentoo
|
||||
# - define_roles
|
||||
# pillars_from_files:
|
||||
# nsd.sls: pillar.example
|
||||
# gentoo.sls: test/salt/pillar/gentoo.sls
|
||||
# define_roles.sls: test/salt/pillar/define_roles.sls
|
||||
# verifier:
|
||||
# inspec_tests:
|
||||
# - path: test/integration/default
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
{%- else %}
|
||||
{% set package = 'dnsutils' %}
|
||||
{%- endif %}
|
||||
|
||||
|
||||
nsd-_test_dependencies--package--installed:
|
||||
pkg.installed:
|
||||
- name: {{ package }}
|
||||
|
||||
@ -25,8 +25,7 @@ nsd:
|
||||
# nsd.conf.d/90-generated-zones will be created and managed.
|
||||
zones:
|
||||
example.test:
|
||||
# Just for testing purpuses
|
||||
multi-master-check: no
|
||||
multi-master-check: 'no'
|
||||
"168.192.in-addr.arpa": {}
|
||||
# NSD's include-pattern directive may be a better way to share configuration
|
||||
# across zones than using YAML anchors.
|
||||
|
||||
@ -22,38 +22,38 @@ control 'nsd.service.running' do
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 ns1.example.test 127.0.0.1') do
|
||||
its('stdout') { should match "192.168.0.1" }
|
||||
its('stdout') { should match '192.168.0.1' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 ns2.example.test 127.0.0.1') do
|
||||
its('stdout') { should match "192.168.0.2" }
|
||||
its('stdout') { should match '192.168.0.2' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 example.test 127.0.0.1') do
|
||||
its('stdout') { should match "192.168.0.10" }
|
||||
its('stdout') { should match '192.168.0.10' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 www.example.test 127.0.0.1') do
|
||||
its('stdout') { should match "192.168.0.10" }
|
||||
its('stdout') { should match '192.168.0.10' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 mail.example.test 127.0.0.1') do
|
||||
its('stdout') { should match "192.168.0.11" }
|
||||
its('stdout') { should match '192.168.0.11' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 192.168.0.1 127.0.0.1') do
|
||||
its('stdout') { should match "ns1.example.test" }
|
||||
its('stdout') { should match 'ns1.example.test' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 192.168.0.2 127.0.0.1') do
|
||||
its('stdout') { should match "ns2.example.test" }
|
||||
its('stdout') { should match 'ns2.example.test' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 192.168.0.10 127.0.0.1') do
|
||||
its('stdout') { should match "example.test" }
|
||||
its('stdout') { should match 'example.test' }
|
||||
end
|
||||
|
||||
describe command('nslookup -port=53530 192.168.0.11 127.0.0.1') do
|
||||
its('stdout') { should match "mail.example.test" }
|
||||
its('stdout') { should match 'mail.example.test' }
|
||||
end
|
||||
end
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
@ -47,4 +47,3 @@ values:
|
||||
example.test:
|
||||
multi-master-check: false
|
||||
zones_dir: "/etc/nsd/zones"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user