aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Cooper <josh@puppet.com>2019-10-24 09:21:18 -0700
committerGitHub <noreply@github.com>2019-10-24 09:21:18 -0700
commit4d06bf11e5ea8d33d7675728f1c40796c5973e1d (patch)
tree6150f4532bd1436eb9b8c983efae42ed8fc0ccc9
parent0d05d3a96240daa88baec140bbaca550efe68bc6 (diff)
parentf36a76412cc17ba707077c912267f608ed2520f3 (diff)
downloadpuppet-augeas_core-4d06bf11e5ea8d33d7675728f1c40796c5973e1d.tar.gz
puppet-augeas_core-4d06bf11e5ea8d33d7675728f1c40796c5973e1d.tar.bz2
Merge pull request #21 from puppetlabs/pdksync_update-pdk
pdksync - (maint) Update module using PDK 1.14.0
-rw-r--r--.sync.yml6
-rw-r--r--Gemfile1
-rw-r--r--data/common.yaml1
-rw-r--r--hiera.yaml21
-rw-r--r--metadata.json6
5 files changed, 32 insertions, 3 deletions
diff --git a/.sync.yml b/.sync.yml
index 9d88d65..6505dc2 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -23,6 +23,12 @@
Style/VariableName:
Enabled: false
Gemfile:
+ optional:
+ ':development':
+ - gem: 'github_changelog_generator'
+ git: 'https://github.com/skywinder/github-changelog-generator'
+ ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+ condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
required:
':system_tests':
- gem: 'puppet-module-posix-system-r#{minor_version}'
diff --git a/Gemfile b/Gemfile
index 4ba6e88..5710b77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,7 @@ group :development do
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-strings", require: false
+ gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
diff --git a/data/common.yaml b/data/common.yaml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/data/common.yaml
@@ -0,0 +1 @@
+---
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..2251c23
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,21 @@
+---
+version: 5
+
+defaults: # Used for any hierarchy level that omits these keys.
+ datadir: data # This path is relative to hiera.yaml's directory.
+ data_hash: yaml_data # Use the built-in YAML backend.
+
+hierarchy:
+ - name: "osfamily/major release"
+ paths:
+ - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+ # Used for Solaris
+ - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
+ # Used to distinguish between Debian and Ubuntu
+ - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+ - name: "osfamily"
+ paths:
+ - "os/%{facts.os.family}.yaml"
+ - "os/%{facts.os.name}.yaml"
+ - name: 'common'
+ path: 'common.yaml'
diff --git a/metadata.json b/metadata.json
index 15792dc..633f02f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,7 +1,7 @@
{
"name": "puppetlabs-augeas_core",
"version": "1.0.4",
- "author": "Puppet Labs",
+ "author": "puppetlabs",
"summary": "Manage files using Augeas",
"license": "Apache-2.0",
"source": "https://github.com/puppetlabs/puppetlabs-augeas_core",
@@ -61,6 +61,6 @@
}
],
"pdk-version": "1.14.0",
- "template-url": "https://github.com/puppetlabs/pdk-templates#master",
- "template-ref": "heads/master-0-g6b5ed92"
+ "template-url": "https://github.com/puppetlabs/pdk-templates#1.14.0",
+ "template-ref": "1.14.0-0-g1bf3a4e"
}