Yamllint fixes
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
3bf9b4e1d1
commit
ff96db8fe9
@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
- Cookstyle fixes
|
||||
- ChefSpec fixes
|
||||
- Yamllint fixes
|
||||
|
||||
## 5.3.1 (2018-07-24)
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
---
|
||||
driver:
|
||||
name: dokken
|
||||
privileged: true # because Docker and SystemD/Upstart
|
||||
privileged: true # because Docker and SystemD/Upstart
|
||||
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
|
||||
chef_license: accept-no-persist
|
||||
|
||||
@ -15,65 +16,65 @@ verifier:
|
||||
name: inspec
|
||||
|
||||
platforms:
|
||||
- name: amazonlinux
|
||||
driver:
|
||||
image: dokken/amazonlinux
|
||||
pid_one_command: /sbin/init
|
||||
- name: amazonlinux
|
||||
driver:
|
||||
image: dokken/amazonlinux
|
||||
pid_one_command: /sbin/init
|
||||
|
||||
- name: amazonlinux-2
|
||||
driver:
|
||||
image: dokken/amazonlinux-2
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
- name: amazonlinux-2
|
||||
driver:
|
||||
image: dokken/amazonlinux-2
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
|
||||
- name: debian-9
|
||||
driver:
|
||||
image: dokken/debian-9
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
- name: debian-9
|
||||
driver:
|
||||
image: dokken/debian-9
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
|
||||
- name: debian-10
|
||||
driver:
|
||||
image: dokken/debian-10
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
- name: debian-10
|
||||
driver:
|
||||
image: dokken/debian-10
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
|
||||
- name: centos-6
|
||||
driver:
|
||||
image: dokken/centos-6
|
||||
pid_one_command: /sbin/init
|
||||
- name: centos-6
|
||||
driver:
|
||||
image: dokken/centos-6
|
||||
pid_one_command: /sbin/init
|
||||
|
||||
- name: centos-7
|
||||
driver:
|
||||
image: dokken/centos-7
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
- name: centos-7
|
||||
driver:
|
||||
image: dokken/centos-7
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
|
||||
- name: centos-8
|
||||
driver:
|
||||
image: dokken/centos-8
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
- name: centos-8
|
||||
driver:
|
||||
image: dokken/centos-8
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
|
||||
- name: fedora-latest
|
||||
driver:
|
||||
image: dokken/fedora-latest
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
- name: fedora-latest
|
||||
driver:
|
||||
image: dokken/fedora-latest
|
||||
pid_one_command: /usr/lib/systemd/systemd
|
||||
|
||||
- name: ubuntu-16.04
|
||||
driver:
|
||||
image: dokken/ubuntu-16.04
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
- name: ubuntu-16.04
|
||||
driver:
|
||||
image: dokken/ubuntu-16.04
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
|
||||
- name: ubuntu-18.04
|
||||
driver:
|
||||
image: dokken/ubuntu-18.04
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
- name: ubuntu-18.04
|
||||
driver:
|
||||
image: dokken/ubuntu-18.04
|
||||
pid_one_command: /bin/systemd
|
||||
intermediate_instructions:
|
||||
- RUN /usr/bin/apt-get update
|
||||
|
||||
- name: opensuse-leap-15
|
||||
driver:
|
||||
image: dokken/opensuse-leap-15
|
||||
pid_one_command: /bin/systemd
|
||||
- name: opensuse-leap-15
|
||||
driver:
|
||||
image: dokken/opensuse-leap-15
|
||||
pid_one_command: /bin/systemd
|
||||
|
109
kitchen.yml
109
kitchen.yml
@ -1,3 +1,4 @@
|
||||
---
|
||||
driver:
|
||||
name: vagrant
|
||||
|
||||
@ -29,64 +30,64 @@ platforms:
|
||||
run_list: apt::default
|
||||
|
||||
suites:
|
||||
- name: default
|
||||
run_list:
|
||||
- recipe[postfix]
|
||||
- name: default
|
||||
run_list:
|
||||
- recipe[postfix]
|
||||
|
||||
- name: aliases
|
||||
run_list:
|
||||
- recipe[postfix::aliases]
|
||||
- name: aliases
|
||||
run_list:
|
||||
- recipe[postfix::aliases]
|
||||
|
||||
- name: client
|
||||
run_list:
|
||||
- recipe[postfix::client]
|
||||
- name: client
|
||||
run_list:
|
||||
- recipe[postfix::client]
|
||||
|
||||
- name: server
|
||||
run_list:
|
||||
- recipe[postfix::server]
|
||||
- name: server
|
||||
run_list:
|
||||
- recipe[postfix::server]
|
||||
|
||||
- name: canonical
|
||||
run_list:
|
||||
- recipe[postfix]
|
||||
attributes:
|
||||
postfix:
|
||||
recipient_canonical_map_entries:
|
||||
john: john@doe.com
|
||||
- name: canonical
|
||||
run_list:
|
||||
- recipe[postfix]
|
||||
attributes:
|
||||
postfix:
|
||||
recipient_canonical_map_entries:
|
||||
john: john@doe.com
|
||||
|
||||
- name: sasl_auth_none
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
- name: sasl_auth_none
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
|
||||
- name: sasl_auth_multiple
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
sasl:
|
||||
relayhost1:
|
||||
username: "kitchenuser"
|
||||
password: "not-a-real-thing"
|
||||
relayhost2:
|
||||
username: "anotherkitchenuser"
|
||||
password: "yet-not-a-real-thing"
|
||||
- name: sasl_auth_multiple
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
sasl:
|
||||
relayhost1:
|
||||
username: "kitchenuser"
|
||||
password: "not-a-real-thing"
|
||||
relayhost2:
|
||||
username: "anotherkitchenuser"
|
||||
password: "yet-not-a-real-thing"
|
||||
|
||||
- name: sasl_auth_one
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
sasl:
|
||||
relayhost:
|
||||
username: "kitchenuser"
|
||||
password: "not-a-real-thing"
|
||||
- name: sasl_auth_one
|
||||
run_list:
|
||||
- recipe[postfix::sasl_auth]
|
||||
attributes:
|
||||
postfix:
|
||||
main:
|
||||
relayhost: "localhost"
|
||||
smtp_sasl_auth_enable: "yes"
|
||||
sasl:
|
||||
relayhost:
|
||||
username: "kitchenuser"
|
||||
password: "not-a-real-thing"
|
||||
|
Loading…
x
Reference in New Issue
Block a user