diff --git a/Puppetfile.vendor b/Puppetfile.vendor
index 2a26494edb9..3edda293993 100644
--- a/Puppetfile.vendor
+++ b/Puppetfile.vendor
@@ -2,7 +2,7 @@ moduledir 'vendor_modules'
mod 'augeas_core',
:git => 'https://github.com/puppetlabs/puppetlabs-augeas_core.git',
- :ref => 'v1.2.0'
+ :ref => 'v1.4.1'
mod 'augeasproviders_core',
:git => 'https://github.com/voxpupuli/puppet-augeasproviders_core.git',
diff --git a/vendor_modules/augeas_core/.devcontainer/README.md b/vendor_modules/augeas_core/.devcontainer/README.md
new file mode 100644
index 00000000000..a7193616898
--- /dev/null
+++ b/vendor_modules/augeas_core/.devcontainer/README.md
@@ -0,0 +1,38 @@
+# devcontainer
+
+
+For format details, see https://aka.ms/devcontainer.json.
+
+For config options, see the README at:
+https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+
+``` json
+{
+ "name": "Puppet Development Kit (Community)",
+ "dockerFile": "Dockerfile",
+
+ // Set *default* container specific settings.json values on container create.
+ "settings": {
+ "terminal.integrated.profiles.linux": {
+ "bash": {
+ "path": "bash",
+ }
+ }
+ },
+
+ // Add the IDs of extensions you want installed when the container is created.
+ "extensions": [
+ "puppet.puppet-vscode",
+ "rebornix.Ruby"
+ ],
+
+ // Use 'forwardPorts' to make a list of ports inside the container available locally.
+ "forwardPorts": [],
+
+ // Use 'postCreateCommand' to run commands after the container is created.
+ "postCreateCommand": "pdk --version",
+}
+```
+
+
+
diff --git a/vendor_modules/augeas_core/.devcontainer/devcontainer.json b/vendor_modules/augeas_core/.devcontainer/devcontainer.json
index f1a55dc3f0a..cdd65d220af 100644
--- a/vendor_modules/augeas_core/.devcontainer/devcontainer.json
+++ b/vendor_modules/augeas_core/.devcontainer/devcontainer.json
@@ -1,23 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
{
"name": "Puppet Development Kit (Community)",
"dockerFile": "Dockerfile",
- // Set *default* container specific settings.json values on container create.
"settings": {
- "terminal.integrated.shell.linux": "/bin/bash"
+ "terminal.integrated.profiles.linux": {
+ "bash": {
+ "path": "bash"
+ }
+ }
},
- // Add the IDs of extensions you want installed when the container is created.
"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
-
- // Use 'forwardPorts' to make a list of ports inside the container available locally.
- // "forwardPorts": [],
-
- // Use 'postCreateCommand' to run commands after the container is created.
- // "postCreateCommand": "pdk --version",
}
diff --git a/vendor_modules/augeas_core/.github/workflows/auto_release.yml b/vendor_modules/augeas_core/.github/workflows/auto_release.yml
index e0284836004..501dc1ce32d 100644
--- a/vendor_modules/augeas_core/.github/workflows/auto_release.yml
+++ b/vendor_modules/augeas_core/.github/workflows/auto_release.yml
@@ -2,83 +2,14 @@ name: "Auto release"
on:
workflow_dispatch:
-
-env:
- HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
- HONEYCOMB_DATASET: litmus tests
- CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ inputs:
+ version:
+ description: "Module version to be released. Must be a valid semver string. (1.2.3)"
+ required: true
jobs:
- auto_release:
- name: "Automatic release prep"
- runs-on: ubuntu-20.04
-
- steps:
- - name: "Honeycomb: Start recording"
- uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
- with:
- apikey: ${{ env.HONEYCOMB_WRITEKEY }}
- dataset: ${{ env.HONEYCOMB_DATASET }}
- job-status: ${{ job.status }}
-
- - name: "Honeycomb: start first step"
- run: |
- echo STEP_ID="auto-release" >> $GITHUB_ENV
- echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
- - name: "Checkout Source"
- if: ${{ github.repository_owner == 'puppetlabs' }}
- uses: actions/checkout@v2
- with:
- fetch-depth: 0
- persist-credentials: false
-
- - name: "PDK Release prep"
- uses: docker://puppet/iac_release:ci
- with:
- args: 'release prep --force'
- env:
- CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: "Get Version"
- if: ${{ github.repository_owner == 'puppetlabs' }}
- id: gv
- run: |
- echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
-
- - name: "Commit changes"
- if: ${{ github.repository_owner == 'puppetlabs' }}
- run: |
- git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
- git config --local user.name "GitHub Action"
- git add .
- git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
-
- - name: Create Pull Request
- id: cpr
- uses: puppetlabs/peter-evans-create-pull-request@v3
- if: ${{ github.repository_owner == 'puppetlabs' }}
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
- branch: "release-prep"
- delete-branch: true
- title: "Release prep v${{ steps.gv.outputs.ver }}"
- body: |
- Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}.
- Please verify before merging:
- - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
- - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
- - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
- labels: "maintenance"
-
- - name: PR outputs
- if: ${{ github.repository_owner == 'puppetlabs' }}
- run: |
- echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
- echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
-
- - name: "Honeycomb: Record finish step"
- if: ${{ always() }}
- run: |
- buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
+ release_prep:
+ uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
+ with:
+ version: "${{ github.event.inputs.version }}"
+ secrets: "inherit"
diff --git a/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
index d027aa46220..7d3c1873dfd 100644
--- a/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
+++ b/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
@@ -4,58 +4,11 @@ name: '[Daily] Unit Tests with nightly Puppet gem'
on:
schedule:
- cron: '0 5 * * 1-5'
+ workflow_dispatch:
jobs:
daily_unit_tests_with_nightly_puppet_gem:
- name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
- strategy:
- matrix:
- os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 6, 7 ]
- include:
- - puppet_version: 6
- ruby: 2.5
- - puppet_version: 7
- ruby: 2.7
-
- - os: 'ubuntu-18.04'
- os_type: 'Linux'
- env_set_cmd: 'export '
- gem_file: 'puppet-latest.gem'
- - os: 'macos-10.15'
- os_type: 'macOS'
- env_set_cmd: 'export '
- gem_file: 'puppet-latest-universal-darwin.gem'
- - os: 'windows-2016'
- os_type: 'Windows'
- env_set_cmd: '$env:'
- gem_file: 'puppet-latest-x64-mingw32.gem'
-
- runs-on: ${{ matrix.os }}
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: Install ruby version ${{ matrix.ruby }}
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby }}
-
- - name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
- run: |
- curl http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
- gem install puppet.gem -N
-
- - name: Prepare testing environment with bundler
- run: |
- git config --global core.longpaths true
- bundle config set system 'true'
- bundle config set --local without 'release'
- ${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
- bundle update --jobs 4 --retry 3
-
- - name: Run unit tests
- run: bundle exec rake parallel_spec
+ uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml@main"
notify-via-slack:
name: Notify workflow conclusion via Slack
diff --git a/vendor_modules/augeas_core/.github/workflows/release.yml b/vendor_modules/augeas_core/.github/workflows/release.yml
index 1509f6e91f9..0b7b8a05dd1 100644
--- a/vendor_modules/augeas_core/.github/workflows/release.yml
+++ b/vendor_modules/augeas_core/.github/workflows/release.yml
@@ -4,44 +4,6 @@ on:
workflow_dispatch:
jobs:
- create-github-release:
- name: Deploy GitHub Release
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: ${{ github.ref }}
- clean: true
- fetch-depth: 0
- - name: Get Version
- id: gv
- run: |
- echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
- - name: Create Release
- uses: actions/create-release@v1
- id: create_release
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- tag_name: "v${{ steps.gv.outputs.ver }}"
- draft: false
- prerelease: false
-
- deploy-forge:
- name: Deploy to Forge
- runs-on: ubuntu-20.04
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: ${{ github.ref }}
- clean: true
- - name: "PDK Build"
- uses: docker://puppet/pdk:nightly
- with:
- args: 'build'
- - name: "Push to Forge"
- uses: docker://puppet/pdk:nightly
- with:
- args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
+ release:
+ uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
+ secrets: "inherit"
diff --git a/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml b/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml
index 9a132eb865f..b63922048e9 100644
--- a/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml
+++ b/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml
@@ -15,10 +15,10 @@ jobs:
ruby_version: 2.6
extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file
- runs-on: 'ubuntu-18.04'
+ runs-on: 'ubuntu-20.04'
steps:
- name: Checkout current PR code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
diff --git a/vendor_modules/augeas_core/.github/workflows/unit_tests.yaml b/vendor_modules/augeas_core/.github/workflows/unit_tests.yaml
new file mode 100644
index 00000000000..81a0f34ed78
--- /dev/null
+++ b/vendor_modules/augeas_core/.github/workflows/unit_tests.yaml
@@ -0,0 +1,16 @@
+---
+name: Unit Tests
+
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+ workflow_dispatch:
+
+jobs:
+ Nightly:
+ uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml@main"
+
+ Released:
+ uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_released_puppet_gem.yaml@main"
diff --git a/vendor_modules/augeas_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/vendor_modules/augeas_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
deleted file mode 100644
index e2122bd70d9..00000000000
--- a/vendor_modules/augeas_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-name: Unit Tests with nightly Puppet gem
-
-on:
- push:
- branches: [ main ]
- pull_request:
- branches: [ main ]
-
-jobs:
- unit_tests_with_nightly_puppet_gem:
- name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
- strategy:
- matrix:
- os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 6, 7 ]
- include:
- - puppet_version: 6
- ruby: 2.5
- - puppet_version: 7
- ruby: 2.7
-
- - os: 'ubuntu-18.04'
- os_type: 'Linux'
- env_set_cmd: 'export '
- gem_file: 'puppet-latest.gem'
- - os: 'macos-10.15'
- os_type: 'macOS'
- env_set_cmd: 'export '
- gem_file: 'puppet-latest-universal-darwin.gem'
- - os: 'windows-2016'
- os_type: 'Windows'
- env_set_cmd: '$env:'
- gem_file: 'puppet-latest-x64-mingw32.gem'
-
- runs-on: ${{ matrix.os }}
- steps:
- - name: Checkout current PR code
- uses: actions/checkout@v2
-
- - name: Install ruby version ${{ matrix.ruby }}
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby }}
-
- - name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
- run: |
- curl http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
- gem install puppet.gem -N
-
- - name: Prepare testing environment with bundler
- run: |
- git config --global core.longpaths true
- bundle config set system 'true'
- bundle config set --local without 'release'
- ${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]')
- bundle update --jobs 4 --retry 3
-
- - name: Run unit tests
- run: bundle exec rake parallel_spec
diff --git a/vendor_modules/augeas_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/vendor_modules/augeas_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml
deleted file mode 100644
index bd157f375a0..00000000000
--- a/vendor_modules/augeas_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: Unit Tests with released Puppet gem
-
-on:
- push:
- branches: [ main ]
- pull_request:
- branches: [ main ]
-
-jobs:
- unit_tests_with_released_puppet_gem:
- name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
- strategy:
- matrix:
- os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2016' ]
- puppet_version: [ 6, 7 ]
- include:
- - puppet_version: 6
- ruby: 2.5
- - puppet_version: 7
- ruby: 2.7
-
- - os: 'ubuntu-18.04'
- os_type: 'Linux'
- - os: 'macos-10.15'
- os_type: 'macOS'
- - os: 'windows-2016'
- os_type: 'Windows'
-
- runs-on: ${{ matrix.os }}
- env:
- PUPPET_GEM_VERSION: ~> ${{ matrix.puppet_version }}.0
- steps:
- - name: Checkout current PR code
- uses: actions/checkout@v2
-
- - name: Install ruby version ${{ matrix.ruby }}
- uses: ruby/setup-ruby@v1
- with:
- ruby-version: ${{ matrix.ruby }}
-
- - name: Prepare testing environment with bundler
- run: |
- git config --global core.longpaths true
- bundle config set system 'true'
- bundle config set --local without 'release'
- bundle update --jobs 4 --retry 3
-
- - name: Run unit tests
- run: bundle exec rake parallel_spec
diff --git a/vendor_modules/augeas_core/.rubocop.yml b/vendor_modules/augeas_core/.rubocop.yml
index 4416e785f73..5019c2b0c52 100644
--- a/vendor_modules/augeas_core/.rubocop.yml
+++ b/vendor_modules/augeas_core/.rubocop.yml
@@ -4,7 +4,7 @@ require:
- rubocop-rspec
AllCops:
DisplayCopNames: true
- TargetRubyVersion: '2.4'
+ TargetRubyVersion: '2.5'
Include:
- "**/*.rb"
Exclude:
diff --git a/vendor_modules/augeas_core/.sync.yml b/vendor_modules/augeas_core/.sync.yml
index ff66415c2dc..e59781fdca8 100644
--- a/vendor_modules/augeas_core/.sync.yml
+++ b/vendor_modules/augeas_core/.sync.yml
@@ -40,9 +40,16 @@ Gemfile:
from_env: BEAKER_PUPPET_VERSION
version: '~> 1.22'
- gem: github_changelog_generator
+ version: '= 1.16.4'
+ - gem: concurrent-ruby
+ version: '= 1.1.10'
+ - gem: async
+ version: '~> 1'
- gem: beaker-module_install_helper
- gem: beaker-puppet_install_helper
- gem: nokogiri
+ ":system_tests":
+ - gem: voxpupuli-acceptance
appveyor.yml:
delete: true
@@ -54,6 +61,3 @@ appveyor.yml:
unmanaged: false
.gitlab-ci.yml:
delete: true
-
-Rakefile:
- changelog_version_tag_pattern: '%s'
diff --git a/vendor_modules/augeas_core/CHANGELOG.md b/vendor_modules/augeas_core/CHANGELOG.md
index a1dc27b5624..a5a1a7fccb5 100644
--- a/vendor_modules/augeas_core/CHANGELOG.md
+++ b/vendor_modules/augeas_core/CHANGELOG.md
@@ -1,90 +1,109 @@
-# Change log
+
+# Changelog
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+All notable changes to this project will be documented in this file.
-## [1.2.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.2.0) (2021-10-01)
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
-[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.2...1.2.0)
+## [v1.4.1](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/v1.4.1) - 2023-09-21
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/v1.4.0...v1.4.1)
+
+## [v1.4.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/v1.4.0) - 2023-09-18
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/v1.3.0...v1.4.0)
+
+### Added
+
+- (PA-5722) Add frozen string magic comment [#61](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/61) ([mhashizume](https://github.com/mhashizume))
+
+## [v1.3.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/v1.3.0) - 2023-02-14
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/v1.2.0...v1.3.0)
### Added
-- \(MODULES-11167\) \(MODULES-11191\) Add RockyLinux && AlmaLinux to augeas-core metadata [\#40](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/40) ([BobosilaVictor](https://github.com/BobosilaVictor))
+- (MODULES-11371) Updates PDK template [#56](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/56) ([mhashizume](https://github.com/mhashizume))
+
+## [v1.2.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/v1.2.0) - 2021-10-01
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.2...v1.2.0)
+
+### Added
+
+- (MODULES-11167) (MODULES-11191) Add RockyLinux && AlmaLinux to augeas-core metadata [#40](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/40) ([BobosilaVictor](https://github.com/BobosilaVictor))
### Fixed
-- \(MODULES-8183\) Fix ToC truncation in REFERENCE.md [\#42](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/42) ([GabrielNagy](https://github.com/GabrielNagy))
+- (MODULES-8183) Fix ToC truncation in REFERENCE.md [#42](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/42) ([GabrielNagy](https://github.com/GabrielNagy))
-## [1.1.2](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.2) (2021-03-08)
+## [1.1.2](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.2) - 2021-03-08
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.1...1.1.2)
### Fixed
-- \(MODULES-10950\) Infer application name from run mode [\#37](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/37) ([GabrielNagy](https://github.com/GabrielNagy))
+- (MODULES-10950) Infer application name from run mode [#37](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/37) ([GabrielNagy](https://github.com/GabrielNagy))
-## [1.1.1](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.1) (2020-09-29)
+## [1.1.1](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.1) - 2020-09-29
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.1.0...1.1.1)
### Fixed
-- \(maint\) Readd puppet-blacksmith dependency [\#30](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/30) ([GabrielNagy](https://github.com/GabrielNagy))
+- (maint) Readd puppet-blacksmith dependency [#30](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/30) ([GabrielNagy](https://github.com/GabrielNagy))
-## [1.1.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.0) (2020-09-29)
+## [1.1.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.1.0) - 2020-09-29
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.5...1.1.0)
### Added
-- \(MODULES-7397\) Load Augeas lenses from modules [\#27](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/27) ([luchihoratiu](https://github.com/luchihoratiu))
+- (MODULES-7397) Load Augeas lenses from modules [#27](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/27) ([luchihoratiu](https://github.com/luchihoratiu))
-## [1.0.5](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.5) (2019-10-31)
+## [1.0.5](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.5) - 2019-11-01
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.4...1.0.5)
### Added
-- pdksync - \(maint\) Update module using PDK 1.14.0 [\#21](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/21) ([mihaibuzgau](https://github.com/mihaibuzgau))
+- pdksync - (maint) Update module using PDK 1.14.0 [#21](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/21) ([mihaibuzgau](https://github.com/mihaibuzgau))
-## [1.0.4](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.4) (2019-01-10)
+## [1.0.4](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.4) - 2019-01-10
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.3...1.0.4)
### Added
-- \(L10n\) Updating translations for readmes/README\_ja\_JP.md [\#16](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/16) ([ehom](https://github.com/ehom))
+- (L10n) Updating translations for readmes/README_ja_JP.md [#16](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/16) ([ehom](https://github.com/ehom))
-## [1.0.3](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.3) (2018-10-02)
+## [1.0.3](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.3) - 2018-10-02
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.2...1.0.3)
### Added
-- \(MODULES-8014\) relatively require helper code [\#9](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/9) ([melissa](https://github.com/melissa))
+- (MODULES-8014) relatively require helper code [#9](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/9) ([melissa](https://github.com/melissa))
-## [1.0.2](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.2) (2018-09-26)
+## [1.0.2](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.2) - 2018-09-26
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.1...1.0.2)
### Fixed
-- \(MODULES-7814\) Ignore nil values when parsing commands. Fix for: Could not evaluate: undefined method strip! for nil:NilClass [\#8](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/8) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
+- (MODULES-7814) Ignore nil values when parsing commands. Fix for: Could not evaluate: undefined method strip! for nil:NilClass [#8](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/8) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
-## [1.0.1](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.1) (2018-08-17)
+## [1.0.1](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.1) - 2018-08-17
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/1.0.0...1.0.1)
### Added
-- \(PUP-9053\) Enable localization [\#5](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/5) ([melissa](https://github.com/melissa))
-- Include puppet 6 and remove default role [\#3](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/3) ([joshcooper](https://github.com/joshcooper))
-- \(maint\) Update beaker-puppet version to 0.16 [\#2](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/2) ([melissa](https://github.com/melissa))
-- Safely deserialize stringified array [\#1](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/1) ([jhelwig](https://github.com/jhelwig))
+- (PUP-9053) Enable localization [#5](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/5) ([melissa](https://github.com/melissa))
+- Include puppet 6 and remove default role [#3](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/3) ([joshcooper](https://github.com/joshcooper))
+- (maint) Update beaker-puppet version to 0.16 [#2](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/2) ([melissa](https://github.com/melissa))
+- Safely deserialize stringified array [#1](https://github.com/puppetlabs/puppetlabs-augeas_core/pull/1) ([jhelwig](https://github.com/jhelwig))
-## [1.0.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.0) (2018-07-02)
+## [1.0.0](https://github.com/puppetlabs/puppetlabs-augeas_core/tree/1.0.0) - 2018-07-02
[Full Changelog](https://github.com/puppetlabs/puppetlabs-augeas_core/compare/b9263341547f13a6af09f748d9b9ac483b5d2030...1.0.0)
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/vendor_modules/augeas_core/CODEOWNERS b/vendor_modules/augeas_core/CODEOWNERS
index d136f7479b4..03deaa38309 100644
--- a/vendor_modules/augeas_core/CODEOWNERS
+++ b/vendor_modules/augeas_core/CODEOWNERS
@@ -1 +1 @@
-* @puppetlabs/night-s-watch
+* @puppetlabs/phoenix
diff --git a/vendor_modules/augeas_core/Gemfile b/vendor_modules/augeas_core/Gemfile
index 26f0defe842..e5d46032f07 100644
--- a/vendor_modules/augeas_core/Gemfile
+++ b/vendor_modules/augeas_core/Gemfile
@@ -13,31 +13,44 @@ def location_for(place_or_version, fake_version = nil)
end
end
-ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = ruby_version_segments[0..1].join('.')
-
group :development do
- gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
- gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
- gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
- gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
- gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
- gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
- gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
+ gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
+ gem "facterdb", '~> 1.18', require: false
+ gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
+ gem "puppetlabs_spec_helper", '~> 5.0', require: false
+ gem "rspec-puppet-facts", '~> 2.0', require: false
+ gem "codecov", '~> 0.2', require: false
+ gem "dependency_checker", '~> 0.2', require: false
+ gem "parallel_tests", '= 3.12.1', require: false
+ gem "pry", '~> 0.10', require: false
+ gem "simplecov-console", '~> 0.5', require: false
+ gem "puppet-debugger", '~> 1.0', require: false
+ gem "rubocop", '= 1.6.1', require: false
+ gem "rubocop-performance", '= 1.9.1', require: false
+ gem "rubocop-rspec", '= 2.0.1', require: false
+ gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.30')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.9')
- gem "beaker-pe", require: false
+ gem "beaker-pe", require: false
gem "beaker-hostgenerator"
gem "beaker-rspec"
gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.22')
- gem "github_changelog_generator", require: false
- gem "beaker-module_install_helper", require: false
- gem "beaker-puppet_install_helper", require: false
- gem "nokogiri", require: false
+ gem "github_changelog_generator", '= 1.16.4', require: false
+ gem "concurrent-ruby", '= 1.1.10', require: false
+ gem "async", '~> 1', require: false
+ gem "beaker-module_install_helper", require: false
+ gem "beaker-puppet_install_helper", require: false
+ gem "nokogiri", require: false
end
group :system_tests do
- gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
- gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
+ gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
+ gem "serverspec", '~> 2.41', require: false
+ gem "voxpupuli-acceptance"
end
puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/vendor_modules/augeas_core/REFERENCE.md b/vendor_modules/augeas_core/REFERENCE.md
index 80191005a91..f44542a55df 100644
--- a/vendor_modules/augeas_core/REFERENCE.md
+++ b/vendor_modules/augeas_core/REFERENCE.md
@@ -58,20 +58,20 @@ Default value: `0`
The following parameters are available in the `augeas` type.
-* [`changes`](#changes)
-* [`context`](#context)
-* [`force`](#force)
-* [`incl`](#incl)
-* [`lens`](#lens)
-* [`load_path`](#load_path)
-* [`name`](#name)
-* [`onlyif`](#onlyif)
-* [`provider`](#provider)
-* [`root`](#root)
-* [`show_diff`](#show_diff)
-* [`type_check`](#type_check)
-
-##### `changes`
+* [`changes`](#-augeas--changes)
+* [`context`](#-augeas--context)
+* [`force`](#-augeas--force)
+* [`incl`](#-augeas--incl)
+* [`lens`](#-augeas--lens)
+* [`load_path`](#-augeas--load_path)
+* [`name`](#-augeas--name)
+* [`onlyif`](#-augeas--onlyif)
+* [`provider`](#-augeas--provider)
+* [`root`](#-augeas--root)
+* [`show_diff`](#-augeas--show_diff)
+* [`type_check`](#-augeas--type_check)
+
+##### `changes`
The changes which should be applied to the filesystem. This
can be a command or an array of commands. The following commands are supported:
@@ -93,7 +93,7 @@ can be a command or an array of commands. The following commands are supported:
If the `context` parameter is set, that value is prepended to any relative `PATH`s.
-##### `context`
+##### `context`
Optional context path. This value is prepended to the paths of all
changes if the path is relative. If the `incl` parameter is set,
@@ -101,39 +101,39 @@ defaults to `/files + incl`; otherwise, defaults to the empty string.
Default value: `''`
-##### `force`
+##### `force`
Optional command to force the augeas type to execute even if it thinks changes
will not be made. This does not override the `onlyif` parameter.
-Default value: ``false``
+Default value: `false`
-##### `incl`
+##### `incl`
Load only a specific file, such as `/etc/hosts`. This can greatly speed
up the execution the resource. When this parameter is set, you must also
set the `lens` parameter to indicate which lens to use.
-##### `lens`
+##### `lens`
Use a specific lens, such as `Hosts.lns`. When this parameter is set, you
must also set the `incl` parameter to indicate which file to load.
The Augeas documentation includes [a list of available lenses](http://augeas.net/stock_lenses.html).
-##### `load_path`
+##### `load_path`
Optional colon-separated list or array of directories; these directories are searched for schema definitions.
The agent's `$libdir/augeas/lenses` path will always be added to support pluginsync.
Default value: `''`
-##### `name`
+##### `name`
namevar
The name of this task. Used for uniqueness.
-##### `onlyif`
+##### `onlyif`
Optional augeas command and comparisons to control the execution of this type.
@@ -164,20 +164,20 @@ where:
Default value: `''`
-##### `provider`
+##### `provider`
The specific backend to use for this `augeas` resource. You will seldom need to specify this --- Puppet will usually
discover the appropriate provider for your platform.
-##### `root`
+##### `root`
A file system path; all files loaded by Augeas are loaded underneath `root`.
Default value: `/`
-##### `show_diff`
+##### `show_diff`
-Valid values: ``true``, ``false``, `yes`, `no`
+Valid values: `true`, `false`, `yes`, `no`
Whether to display differences when the file changes, defaulting to
true. This parameter is useful for files that may contain passwords or
@@ -185,13 +185,13 @@ other secret data, which might otherwise be included in Puppet reports or
other insecure outputs. If the global `show_diff` setting
is false, then no diffs will be shown even if this parameter is true.
-Default value: ``true``
+Default value: `true`
-##### `type_check`
+##### `type_check`
-Valid values: ``true``, ``false``
+Valid values: `true`, `false`
Whether augeas should perform typechecking. Defaults to false.
-Default value: ``false``
+Default value: `false`
diff --git a/vendor_modules/augeas_core/Rakefile b/vendor_modules/augeas_core/Rakefile
index 23e44bfd299..0968702be37 100644
--- a/vendor_modules/augeas_core/Rakefile
+++ b/vendor_modules/augeas_core/Rakefile
@@ -4,9 +4,9 @@ require 'bundler'
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
+require 'voxpupuli/acceptance/rake'
def changelog_user
return unless Rake.application.top_level_tasks.include? "changelog"
@@ -35,7 +35,7 @@ end
def changelog_future_release
return unless Rake.application.top_level_tasks.include? "changelog"
- returnVal = "%s" % JSON.load(File.read('metadata.json'))['version']
+ returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
puts "GitHubChangelogGenerator future_release:#{returnVal}"
returnVal
@@ -43,6 +43,7 @@ end
PuppetLint.configuration.send('disable_relative')
+
if Bundler.rubygems.find_name('github_changelog_generator').any?
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
diff --git a/vendor_modules/augeas_core/metadata.json b/vendor_modules/augeas_core/metadata.json
index c2ffe08da97..a67289a1a45 100644
--- a/vendor_modules/augeas_core/metadata.json
+++ b/vendor_modules/augeas_core/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-augeas_core",
- "version": "1.2.0",
+ "version": "1.4.1",
"author": "puppetlabs",
"summary": "Manage files using Augeas",
"license": "Apache-2.0",
@@ -42,10 +42,10 @@
"requirements": [
{
"name": "puppet",
- "version_requirement": ">= 6.0.0 < 8.0.0"
+ "version_requirement": ">= 6.0.0 < 9.0.0"
}
],
- "pdk-version": "2.2.0",
- "template-url": "https://github.com/puppetlabs/pdk-templates#2.2.0",
- "template-ref": "tags/2.2.0-0-g2381db6"
+ "pdk-version": "3.0.0",
+ "template-url": "https://github.com/puppetlabs/pdk-templates#2.7.5",
+ "template-ref": "tags/2.7.5-0-ge5b0114"
}
diff --git a/vendor_modules/augeas_core/rakelib/commits.rake b/vendor_modules/augeas_core/rakelib/commits.rake
index a900ee24a78..7cee9fa5cbf 100644
--- a/vendor_modules/augeas_core/rakelib/commits.rake
+++ b/vendor_modules/augeas_core/rakelib/commits.rake
@@ -1,4 +1,4 @@
-desc "verify that commit messages match CONTRIBUTING.md requirements"
+desc "verify that commit summaries are properly formatted"
task(:commits) do
# This rake task looks at the summary from every commit from this branch not
# in the branch targeted for a PR.
@@ -7,15 +7,15 @@ task(:commits) do
%x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
# This regex tests for the currently supported commit summary tokens.
# The exception tries to explain it in more full.
- if /^\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
- raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
- "\n\t\t#{commit_summary}\n" \
- "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n" \
- "\t\t(MODULES-) # this is most common and should be a ticket at tickets.puppet.com\n" \
+ if /^Release prep|\((maint|packaging|doc|docs|modules|pa-\d+)\)|revert/i.match(commit_summary).nil?
+ raise "\n\n\n\tPlease make sure that your commit summary (i.e. the first line of the commit message) starts with one of the following:\n" \
+ "\t\t(PA-)\n" \
+ "\t\t(MODULES-)\n" \
"\t\t(docs)\n" \
"\t\t(docs)(DOCUMENT-)\n" \
"\t\t(packaging)\n"
"\t\t(maint)\n" \
+ "\t\tRelease prep v\n" \
"\n\tThis test for the commit summary is case-insensitive.\n\n\n"
else
puts "#{commit_summary}"
diff --git a/vendor_modules/augeas_core/spec/acceptance/tests/services_spec.rb b/vendor_modules/augeas_core/spec/acceptance/tests/services_spec.rb
index 03175e33246..38cc19bc975 100644
--- a/vendor_modules/augeas_core/spec/acceptance/tests/services_spec.rb
+++ b/vendor_modules/augeas_core/spec/acceptance/tests/services_spec.rb
@@ -1,5 +1,10 @@
require 'spec_helper_acceptance'
+# fedora36 has a malformed services entry that needs to be patched
+agents.each do |agent|
+ on(agent, 'sed -i "s/ircd,ircu3/ircd ircu3/" /etc/services') if agent.platform.include?('fedora-36')
+end
+
RSpec.context 'Augeas services file' do
before(:all) do
on agents, 'cp /etc/services /tmp/services.bak'
diff --git a/vendor_modules/augeas_core/spec/default_facts.yml b/vendor_modules/augeas_core/spec/default_facts.yml
index f777abfc990..3346c394df5 100644
--- a/vendor_modules/augeas_core/spec/default_facts.yml
+++ b/vendor_modules/augeas_core/spec/default_facts.yml
@@ -2,7 +2,8 @@
#
# Facts specified here will override the values provided by rspec-puppet-facts.
---
-ipaddress: "172.16.254.254"
-ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+networking:
+ ip: "172.16.254.254"
+ ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+ mac: "AA:AA:AA:AA:AA:AA"
is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/vendor_modules/augeas_core/spec/spec_helper_acceptance.rb b/vendor_modules/augeas_core/spec/spec_helper_acceptance.rb
index a6836f2ec1f..c8f667cc05b 100644
--- a/vendor_modules/augeas_core/spec/spec_helper_acceptance.rb
+++ b/vendor_modules/augeas_core/spec/spec_helper_acceptance.rb
@@ -1,10 +1,63 @@
require 'beaker-rspec'
require 'beaker/module_install_helper'
require 'beaker/puppet_install_helper'
+require 'voxpupuli/acceptance/spec_helper_acceptance'
RSpec.configure do |c|
c.before :suite do
unless ENV['BEAKER_provision'] == 'no'
+
+ DIGICERT = <<-EOM.freeze
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
+RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
+ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
+xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
+ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
+DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
+jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
+CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
+EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
+fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
+uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
+chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
+9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
+SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
+fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
+sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
+cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
+0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
+4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
+r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
+/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
+gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
+-----END CERTIFICATE-----
+EOM
+
+ # Until solaris gets new image we need to add to the cert chain on solaris, call a beaker-puppet setup script to handle this
+ hosts.each do |host|
+ next unless host.platform.match? %r{solaris-11(\.2)?-(i386|sparc)}
+ create_remote_file(host, 'DigiCertTrustedRootG4.crt.pem', DIGICERT)
+ on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
+ on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
+ on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
+ on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
+ timeout = 60
+ counter = 0
+ while on(host, 'svcs -x ca-certificates').output !~ %r{State: online}
+ raise 'ca-certificates services failed start up' if counter > timeout
+ sleep 5
+ counter += 5
+ end
+ end
run_puppet_install_helper
install_module_on(hosts)
install_module_dependencies_on(hosts)