diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..0d0ba02 --- /dev/null +++ b/.yamllint @@ -0,0 +1,6 @@ +--- +extends: default + +rules: + line-length: + max: 160 diff --git a/manifests/examples/azure/jessie.yml b/manifests/examples/azure/jessie.yml index 6095f8b..3823a11 100644 --- a/manifests/examples/azure/jessie.yml +++ b/manifests/examples/azure/jessie.yml @@ -23,10 +23,10 @@ volume: size: 10GiB packages: components: - - main - - contrib - - non-free + - main + - contrib + - non-free plugins: ntp: servers: - - time.windows.com + - time.windows.com diff --git a/manifests/examples/azure/wheezy.yml b/manifests/examples/azure/wheezy.yml index fe9d51c..98e2145 100644 --- a/manifests/examples/azure/wheezy.yml +++ b/manifests/examples/azure/wheezy.yml @@ -23,15 +23,15 @@ volume: size: 10GiB packages: components: - - main - - contrib - - non-free + - main + - contrib + - non-free preferences: backport-kernel: - - package: linux-image-* initramfs-tools - pin: release n=wheezy-backports - pin-priority: 500 + - package: linux-image-* initramfs-tools + pin: release n=wheezy-backports + pin-priority: 500 plugins: ntp: servers: - - time.windows.com + - time.windows.com diff --git a/manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml b/manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml index 1ab1c24..18a3f55 100644 --- a/manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml +++ b/manifests/examples/ec2/ebs-unstable-amd64-pvm-contrib.yml @@ -26,9 +26,9 @@ volume: packages: mirror: http://cloudfront.debian.net/debian components: - - main - - contrib - - non-free + - main + - contrib + - non-free plugins: cloud_init: metadata_sources: Ec2 diff --git a/manifests/examples/kvm/jessie-arm64-virtio.yml b/manifests/examples/kvm/jessie-arm64-virtio.yml index 991090b..c68b048 100644 --- a/manifests/examples/kvm/jessie-arm64-virtio.yml +++ b/manifests/examples/kvm/jessie-arm64-virtio.yml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: diff --git a/manifests/examples/kvm/jessie-puppet.yaml b/manifests/examples/kvm/jessie-puppet.yaml index 1757570..ea7ce40 100644 --- a/manifests/examples/kvm/jessie-puppet.yaml +++ b/manifests/examples/kvm/jessie-puppet.yaml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%Y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: @@ -21,25 +21,25 @@ volume: root: filesystem: ext4 size: 10GiB -packages: +packages: install_standard: true mirror: http://httpredir.debian.org/debian install: - # required to be pre-installed for proper puppet functioning of - # puppetlabs-apt, it is also the primary puppet module + # required to be pre-installed for proper puppet functioning of + # puppetlabs-apt, it is also the primary puppet module - lsb-release plugins: # It is advisable to avoid running things as root, use a sudo account instead admin_user: - username: administrator + username: administrator password: something # puppet plugin puppet: - # The assets path MUST be ABSOLUTE on your project. + # The assets path MUST be ABSOLUTE on your project. assets: /your/absolute/path/to/etc/puppetlabs install_modules: - [puppetlabs-accounts] - [puppetlabs-apt] - [puppetlabs-concat, 3.0.0] - [puppetlabs-stdlib] - - [puppetlabs-apache, 1.11.0] \ No newline at end of file + - [puppetlabs-apache, 1.11.0] diff --git a/manifests/examples/kvm/jessie-virtio.yml b/manifests/examples/kvm/jessie-virtio.yml index 8d53477..40d3441 100644 --- a/manifests/examples/kvm/jessie-virtio.yml +++ b/manifests/examples/kvm/jessie-virtio.yml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%Y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: diff --git a/manifests/examples/kvm/stretch-puppet.yaml b/manifests/examples/kvm/stretch-puppet.yaml index a57a872..a07e26f 100644 --- a/manifests/examples/kvm/stretch-puppet.yaml +++ b/manifests/examples/kvm/stretch-puppet.yaml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%Y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: @@ -21,25 +21,25 @@ volume: root: filesystem: ext4 size: 10GiB -packages: +packages: install_standard: true mirror: http://httpredir.debian.org/debian install: - # required to be pre-installed for proper puppet functioning of - # puppetlabs-apt, it is also the primary puppet module + # required to be pre-installed for proper puppet functioning of + # puppetlabs-apt, it is also the primary puppet module - lsb-release plugins: # It is advisable to avoid running things as root, use a sudo account instead admin_user: - username: administrator + username: administrator password: something # puppet plugin puppet: - # The assets path MUST be ABSOLUTE on your project. + # The assets path MUST be ABSOLUTE on your project. assets: /your/absolute/path/to/etc/puppetlabs install_modules: - [puppetlabs-accounts] - [puppetlabs-apt] - [puppetlabs-concat, 3.0.0] - [puppetlabs-stdlib] - - [puppetlabs-apache, 1.11.0] \ No newline at end of file + - [puppetlabs-apache, 1.11.0] diff --git a/manifests/examples/kvm/stretch-virtio-partitions.yml b/manifests/examples/kvm/stretch-virtio-partitions.yml index 49330cf..f5f72f0 100644 --- a/manifests/examples/kvm/stretch-virtio-partitions.yml +++ b/manifests/examples/kvm/stretch-virtio-partitions.yml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%Y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: diff --git a/manifests/examples/kvm/wheezy-virtio.yml b/manifests/examples/kvm/wheezy-virtio.yml index 53dd943..cb3f2d4 100644 --- a/manifests/examples/kvm/wheezy-virtio.yml +++ b/manifests/examples/kvm/wheezy-virtio.yml @@ -3,8 +3,8 @@ name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d} provider: name: kvm virtio_modules: - - virtio_pci - - virtio_blk + - virtio_pci + - virtio_blk bootstrapper: workspace: /target system: diff --git a/manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml b/manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml index 450d0eb..f6c3a57 100644 --- a/manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml +++ b/manifests/official/ec2/s3-wheezy-amd64-pvm-cn-north-1.yml @@ -33,7 +33,7 @@ packages: plugins: cloud_init: disable_modules: - - landscape - - byobu - - ssh-import-id + - landscape + - byobu + - ssh-import-id username: admin diff --git a/manifests/official/gce/buster-minimal.yml b/manifests/official/gce/buster-minimal.yml index e9532ab..9393949 100644 --- a/manifests/official/gce/buster-minimal.yml +++ b/manifests/official/gce/buster-minimal.yml @@ -34,4 +34,4 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal diff --git a/manifests/official/gce/buster.yml b/manifests/official/gce/buster.yml index 9228d92..622ab12 100644 --- a/manifests/official/gce/buster.yml +++ b/manifests/official/gce/buster.yml @@ -46,7 +46,7 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal unattended_upgrades: download_interval: 1 update_interval: 1 diff --git a/manifests/official/gce/deprecated/wheezy-backports.yml b/manifests/official/gce/deprecated/wheezy-backports.yml index 9c99034..952aedd 100644 --- a/manifests/official/gce/deprecated/wheezy-backports.yml +++ b/manifests/official/gce/deprecated/wheezy-backports.yml @@ -34,21 +34,21 @@ packages: - vim preferences: backport-kernel: - - package: linux-image-* initramfs-tools - pin: release n=wheezy-backports - pin-priority: 500 + - package: linux-image-* initramfs-tools + pin: release n=wheezy-backports + pin-priority: 500 backport-ssh: - - package: init-system-helpers openssh-sftp-server openssh-client openssh-server - pin: release n=wheezy-backports - pin-priority: 500 + - package: init-system-helpers openssh-sftp-server openssh-client openssh-server + pin: release n=wheezy-backports + pin-priority: 500 backport-growroot: - - package: cloud-initramfs-growroot - pin: release n=wheezy-backports - pin-priority: 500 + - package: cloud-initramfs-growroot + pin: release n=wheezy-backports + pin-priority: 500 plugins: google_cloud_repo: - cleanup_bootstrap_key: True - enable_keyring_repo: True + cleanup_bootstrap_key: true + enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal diff --git a/manifests/official/gce/deprecated/wheezy.yml b/manifests/official/gce/deprecated/wheezy.yml index 7270133..1e06367 100644 --- a/manifests/official/gce/deprecated/wheezy.yml +++ b/manifests/official/gce/deprecated/wheezy.yml @@ -34,8 +34,8 @@ packages: - vim plugins: google_cloud_repo: - cleanup_bootstrap_key: True - enable_keyring_repo: True + cleanup_bootstrap_key: true + enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal diff --git a/manifests/official/gce/jessie-minimal.yml b/manifests/official/gce/jessie-minimal.yml index de8b572..bf17548 100644 --- a/manifests/official/gce/jessie-minimal.yml +++ b/manifests/official/gce/jessie-minimal.yml @@ -34,4 +34,4 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal diff --git a/manifests/official/gce/jessie.yml b/manifests/official/gce/jessie.yml index 3954171..a9dd59f 100644 --- a/manifests/official/gce/jessie.yml +++ b/manifests/official/gce/jessie.yml @@ -37,9 +37,9 @@ packages: preferences: # python-crcmod in backports has a compiled version needed for Google Cloud Storage. backport-python-crcmod: - - package: python-crcmod - pin: release n=jessie-backports - pin-priority: 500 + - package: python-crcmod + pin: release n=jessie-backports + pin-priority: 500 plugins: expand_root: filesystem_type: ext4 @@ -50,7 +50,7 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal unattended_upgrades: download_interval: 1 update_interval: 1 diff --git a/manifests/official/gce/stretch-minimal.yml b/manifests/official/gce/stretch-minimal.yml index 15c3429..6790465 100644 --- a/manifests/official/gce/stretch-minimal.yml +++ b/manifests/official/gce/stretch-minimal.yml @@ -34,4 +34,4 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal diff --git a/manifests/official/gce/stretch.yml b/manifests/official/gce/stretch.yml index 7475281..2264aa2 100644 --- a/manifests/official/gce/stretch.yml +++ b/manifests/official/gce/stretch.yml @@ -46,7 +46,7 @@ plugins: enable_keyring_repo: true ntp: servers: - - metadata.google.internal + - metadata.google.internal unattended_upgrades: download_interval: 1 update_interval: 1 diff --git a/tox.ini b/tox.ini index 8a51e64..3eab371 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = flake8, unit, integration, docs +envlist = flake8, yamllint, unit, integration, docs [flake8] ignore = E221,E241,E501 @@ -38,3 +38,7 @@ deps = sphinx != 1.5 sphinx_rtd_theme commands = sphinx-build -W -b html -d _build/html/doctrees . _build/html + +[testenv:yamllint] +deps = yamllint +commands = yamllint manifests