Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now passes yamllint #80

Merged
merged 1 commit into from
Sep 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# yamllint disable rule:line-length
# This file can be used to install module dependencies for unit testing
# See https://github.com/puppetlabs/puppetlabs_spec_helper#using-fixtures for details
---
fixtures:
forge_modules:
augeas_core: "puppetlabs/augeas_core"
# stdlib: "puppetlabs/stdlib"
augeas_core: "puppetlabs/augeas_core"
# stdlib: "puppetlabs/stdlib"
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# yamllint disable rule:line-length rule:truthy
stages:
- syntax
- unit
Expand Down Expand Up @@ -38,4 +39,3 @@ parallel_spec-Ruby 2.4.5-Puppet ~> 5:
- bundle exec rake parallel_spec
variables:
PUPPET_GEM_VERSION: '~> 5'

1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# yamllint disable rule:line-length rule:truthy rule:indentation
require:
- rubocop-rspec
- rubocop-i18n
Expand Down
1 change: 1 addition & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# yamllint disable rule:line-length
.travis.yml:
addons:
apt:
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# yamllint disable rule:line-length rule:truthy
dist: xenial
language: ruby
cache: bundler
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# yamllint disable rule:line-length rule:truthy
version: 1.1.x.{build}
branches:
only:
Expand Down
4 changes: 2 additions & 2 deletions hiera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ hierarchy:
- name: "osfamily/major release"
paths:
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
# Used for Solaris
# Used for Solaris
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
# Used to distinguish between Debian and Ubuntu
# Used to distinguish between Debian and Ubuntu
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
- name: "osfamily"
paths:
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-5-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-5-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-5-x86_64
hypervisor : docker
hypervisor: docker
image: centos:5
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-5.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-5-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-5-x86_64
hypervisor : docker
hypervisor: docker
image: tianon/centos:5.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-6-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : docker
hypervisor: docker
image: centos:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: centos-6-latest
user: root
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : vagrant
box : camptocamp/centos-6-x86_64
hypervisor: vagrant
box: camptocamp/centos-6-x86_64
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-6.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : docker
hypervisor: docker
image: centos:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-7-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : docker
hypervisor: docker
image: centos:7
docker_preserve_image: true
docker_cmd: '["/usr/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: centos-7-latest
user: centos
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : vagrant
box : camptocamp/centos-7-x86_64
hypervisor: vagrant
box: camptocamp/centos-7-x86_64
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/centos-7.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : docker
hypervisor: docker
image: centos:7
docker_preserve_image: true
docker_cmd: '["/usr/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-6-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : docker
hypervisor: docker
image: debian:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: debian-6-latest
user: debian
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : vagrant
box : puppetlabs/debian-6.0.10-64-nocm
hypervisor: vagrant
box: puppetlabs/debian-6.0.10-64-nocm
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-6.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : docker
hypervisor: docker
image: debian/eol:squeeze
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-7-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : docker
hypervisor: docker
image: debian:7
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: debian-7-latest
user: debian
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : vagrant
box : camptocamp/debian-7-amd64
hypervisor: vagrant
box: camptocamp/debian-7-amd64
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-7.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : docker
hypervisor: docker
image: debian:7
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-8-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : docker
hypervisor: docker
image: debian:8
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: debian-8-latest
user: debian
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : vagrant
box : camptocamp/debian-8-amd64
hypervisor: vagrant
box: camptocamp/debian-8-amd64
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-8.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : docker
hypervisor: docker
image: debian:8
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
---
# yamllint disable rule:line-length
HOSTS:
ubuntu-1004-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-10.04-amd64
hypervisor : docker
hypervisor: docker
image: ubuntu:10.04
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : docker
hypervisor: docker
image: ubuntu:12.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : openstack
hypervisor: openstack
flavor: m1.small
image: ubuntu-1204-latest
user: ubuntu
Expand Down
Loading