Skip to content

Commit ee4fdd8

Browse files
authored
Merge pull request #361 from voxpupuli/modulesync
modulesync 10.1.0-26-ga82038c
2 parents fd0e76c + 103c971 commit ee4fdd8

File tree

7 files changed

+22
-284
lines changed

7 files changed

+22
-284
lines changed

.github/CONTRIBUTING.md

Lines changed: 0 additions & 272 deletions
This file was deleted.

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.1.0'
5+
modulesync_config_version: '10.2.0'

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 11.0', :require => false
7+
gem 'voxpupuli-test', '~> 12.0', :require => false
88
gem 'puppet_metadata', '~> 5.0', :require => false
99
end
1010

REFERENCE.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ Struct[{
577577
data_dig => Optional[String],
578578
hiera3_backend => Optional[String],
579579
options => Optional[Hash],
580-
}]
580+
}]
581581
```
582582

583583
### <a name="Hiera--Hiera5_hierarchy"></a>`Hiera::Hiera5_hierarchy`
@@ -587,7 +587,8 @@ This will validate hiera 5 hierarchy array hash
587587
Alias of
588588

589589
```puppet
590-
Array[Struct[{
590+
Array[Struct[
591+
{
591592
name => String,
592593
path => Optional[String],
593594
paths => Optional[Array[String]],
@@ -601,6 +602,7 @@ Array[Struct[{
601602
datadir => Optional[String],
602603
hiera3_backend => Optional[String],
603604
options => Optional[Hash],
604-
}]]
605+
}
606+
]]
605607
```
606608

manifests/init.pp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This class handles installing the hiera.yaml for Puppet's use. Creates either /etc/puppet/hiera.yaml or /etc/puppetlabs/puppet/hiera.yaml in set hiera version and links /etc/hiera.yaml to it. Creates $datadir (if $datadir_manage == true).
33
#
44
# @param hierarchy
5-
# The hiera hierarchy.
5+
# The hiera hierarchy.
66
# @param hiera_version
77
# To set hiera 5 defaults. e.g. datadir, data_hash.
88
# @param hiera5_defaults
@@ -279,15 +279,17 @@
279279
# the above logic. This was neccessary in order to maintain compability
280280
# with prior versions of this module
281281
$eyaml_options = {
282-
'eyaml' => delete_undef_values({
282+
'eyaml' => delete_undef_values(
283+
{
283284
'datadir' => $eyaml_real_datadir,
284285
'extension' => $eyaml_extension,
285286
'pkcs7_private_key' => $_eyaml_pkcs7_private_key,
286287
'pkcs7_public_key' => $_eyaml_pkcs7_public_key,
287288
'encrypt_method' => $encrypt_method,
288289
'gpg_gnupghome' => $gpg_gnupghome,
289290
'gpg_recipients' => $eyaml_gpg_recipients,
290-
}),
291+
},
292+
),
291293
}
292294
$yaml_options = { 'yaml' => { 'datadir' => $datadir } }
293295
# all the backend options are merged together into a single hash

types/hiera5_defaults.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# This will validate hiera 5 'defaults' hash
2-
type Hiera::Hiera5_defaults = Struct[{
2+
type Hiera::Hiera5_defaults = Struct[
3+
{
34
datadir => Optional[String],
45
data_hash => Optional[Enum['yaml_data', 'json_data', 'hocon_data']],
56
lookup_key => Optional[String],
67
data_dig => Optional[String],
78
hiera3_backend => Optional[String],
89
options => Optional[Hash],
9-
}]
10+
}
11+
]

types/hiera5_hierarchy.pp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# This will validate hiera 5 hierarchy array hash
2-
type Hiera::Hiera5_hierarchy = Array[Struct[{
2+
type Hiera::Hiera5_hierarchy = Array[
3+
Struct[
4+
{
35
name => String,
46
path => Optional[String],
57
paths => Optional[Array[String]],
@@ -13,4 +15,6 @@
1315
datadir => Optional[String],
1416
hiera3_backend => Optional[String],
1517
options => Optional[Hash],
16-
}]]
18+
}
19+
]
20+
]

0 commit comments

Comments
 (0)