Skip to content
Open
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
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@ parallel_spec-Ruby 2.7.2-Puppet ~> 7:
- bundle exec rake parallel_spec
variables:
PUPPET_GEM_VERSION: '~> 7'

11 changes: 11 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
extends: default
ignore: |
spec/
.rubocop.yml
rules:
indentation:
spaces: 2
line-length:
level: warning
max: 140
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install:
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
- bundle install --jobs 4 --retry 2 --without system_tests
- type Gemfile.lock
build: off
build: 'off'
test_script:
- bundle exec puppet -V
- ruby -v
Expand Down
2 changes: 1 addition & 1 deletion data/common.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
---
--- {}
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
9 changes: 5 additions & 4 deletions tests/vagrant/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
--- {}
# -*- mode: yaml; -*-
# Time-stamp: <Mon 2017-08-21 23:15 svarrette>
################################################################################
Expand All @@ -6,7 +7,7 @@
# define additional VMs (agents) to deploy upon vagrant up (in addition to the
# puppet master 'master')

#___________________________________________
# ___________________________________________
# Complete / re-define the default boxes below
# Format:
# :<os><version>: <username>/<box> # see https://vagrantcloud.com
Expand All @@ -17,23 +18,23 @@
# :debian8: 'debian/contrib-jessie64',
# :ubuntu14: 'ubuntu/trusty64'

#_________________
# _________________
# Default settings
# :defaults:
# :os: :centos7 # Default OS from the above box definition
# :ram: 512 # Default RAM
# :vcpus: 1 # Default number of virtual CPUs
# :vbguest_auto_update: 1 # check/update box guest additions

#____________________
# ____________________
# Network settings
# :network:
# :domain: 'vagrant.dev' # network domain to use
# :range: '10.10.1.0/24' # IP range to use
# :ip_offset: 10
# # client / VMs defined below will start on xx.xx.xx.<ip_offset>

#___________________________________________________________
# ___________________________________________________________
# VMs / Vagrant boxes to define apart from the puppet master
# Format:
# <name>:
Expand Down