style(syntax): resolve linting errors+warnings

Resolve all rubocop, salt-lint and yamllint complaints.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

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
+# - name: arch-base-latest-3000-8-py2
-  #   driver:
+#   driver:
-  #     image: saltimages/salt-3000.8-py2:arch-base-latest
+#     image: saltimages/salt-3000.8-py2:arch-base-latest
-  #     run_command: /usr/lib/systemd/systemd
+#     run_command: /usr/lib/systemd/systemd
 
 provisioner:
   name: salt_solo
@@ -336,33 +336,33 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
-  # - name: gentoo
+# - name: gentoo
-  #   includes:
+#   includes:
-  #     - gentoo-stage3-latest-master-py3
+#     - gentoo-stage3-latest-master-py3
-  #     - gentoo-stage3-systemd-master-py3
+#     - gentoo-stage3-systemd-master-py3
-  #     - gentoo-stage3-latest-3002-5-py3
+#     - gentoo-stage3-latest-3002-5-py3
-  #     - gentoo-stage3-systemd-3002-5-py3
+#     - gentoo-stage3-systemd-3002-5-py3
-  #     - gentoo-stage3-latest-3001-6-py3
+#     - gentoo-stage3-latest-3001-6-py3
-  #     - gentoo-stage3-systemd-3001-6-py3
+#     - gentoo-stage3-systemd-3001-6-py3
-  #     - gentoo-stage3-latest-3000-8-py3
+#     - gentoo-stage3-latest-3000-8-py3
-  #     - gentoo-stage3-systemd-3000-8-py3
+#     - gentoo-stage3-systemd-3000-8-py3
-  #   provisioner:
+#   provisioner:
-  #     state_top:
+#     state_top:
-  #       base:
+#       base:
-  #         '*':
+#         '*':
-  #           - nsd._mapdata
+#           - nsd._mapdata
-  #           - nsd
+#           - nsd
-  #     pillars:
+#     pillars:
-  #       top.sls:
+#       top.sls:
-  #         base:
+#         base:
-  #           '*':
+#           '*':
-  #             - nsd
+#             - nsd
-  #             - gentoo
+#             - gentoo
-  #             - define_roles
+#             - define_roles
-  #     pillars_from_files:
+#     pillars_from_files:
-  #       nsd.sls: pillar.example
+#       nsd.sls: pillar.example
-  #       gentoo.sls: test/salt/pillar/gentoo.sls
+#       gentoo.sls: test/salt/pillar/gentoo.sls
-  #       define_roles.sls: test/salt/pillar/define_roles.sls
+#       define_roles.sls: test/salt/pillar/define_roles.sls
-  #   verifier:
+#   verifier:
-  #     inspec_tests:
+#     inspec_tests:
-  #       - path: test/integration/default
+#       - path: test/integration/default

nsd/_test_dependencies.sls

@@ -5,7 +5,7 @@
 {%- else %}
 {%    set package = 'dnsutils' %}
 {%- endif %}
-  
+
 nsd-_test_dependencies--package--installed:
   pkg.installed:
     - name: {{ package }}

pillar.example

@@ -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.

test/integration/default/controls/services.rb

@@ -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

test/integration/default/files/_mapdata/amazonlinux-1.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/amazonlinux-2.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/arch-base-latest.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/centos-6.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/centos-7.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/centos-8.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/debian-10.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/debian-9.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/fedora-31.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/fedora-32.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/fedora-33.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/gentoo-2-sysd.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/gentoo-2-sysv.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/opensuse-15.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/oraclelinux-7.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/oraclelinux-8.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/ubuntu-16.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/ubuntu-18.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-

test/integration/default/files/_mapdata/ubuntu-20.yaml

@@ -47,4 +47,3 @@ values:
     example.test:
       multi-master-check: false
   zones_dir: "/etc/nsd/zones"
-