puppet 3.0.2 → 3.1.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- data/Gemfile +13 -11
- data/README.md +9 -7
- data/README_DEVELOPER.md +21 -30
- data/bin/extlookup2hiera +0 -0
- data/conf/auth.conf +42 -26
- data/conf/fileserver.conf +41 -0
- data/conf/tagmail.conf +16 -0
- data/examples/hiera/modules/data/manifests/common.pp +2 -1
- data/examples/hiera/modules/ntp/manifests/config.pp +4 -3
- data/examples/hiera/modules/ntp/manifests/data.pp +2 -1
- data/examples/hiera/modules/users/manifests/common.pp +2 -1
- data/examples/hiera/modules/users/manifests/dc1.pp +2 -1
- data/examples/hiera/modules/users/manifests/development.pp +2 -1
- data/examples/hiera/site.pp +1 -1
- data/ext/debian/fileserver.conf +39 -15
- data/ext/envpuppet +2 -0
- data/ext/gentoo/puppet/fileserver.conf +41 -12
- data/ext/ips/puppet-agent +1 -6
- data/ext/ips/puppetagent.xml +0 -4
- data/ext/osx/postflight.erb +109 -0
- data/ext/project_data.yaml +2 -2
- data/ext/redhat/fileserver.conf +41 -12
- data/ext/redhat/puppet.spec.erb +8 -13
- data/install.rb +2 -5
- data/lib/puppet.rb +30 -13
- data/lib/puppet/application.rb +34 -16
- data/lib/puppet/application/agent.rb +4 -4
- data/lib/puppet/application/master.rb +25 -5
- data/lib/puppet/defaults.rb +11 -7
- data/lib/puppet/dsl.rb +7 -3
- data/lib/puppet/dsl/actions.rb +283 -0
- data/lib/puppet/dsl/blank_slate.rb +55 -0
- data/lib/puppet/dsl/context.rb +393 -0
- data/lib/puppet/dsl/parser.rb +57 -0
- data/lib/puppet/dsl/resource_decorator.rb +56 -0
- data/lib/puppet/dsl/resource_reference.rb +95 -0
- data/lib/puppet/dsl/type_reference.rb +102 -0
- data/lib/puppet/error.rb +1 -1
- data/lib/puppet/face/help.rb +2 -4
- data/lib/puppet/face/man.rb +8 -2
- data/lib/puppet/feature/pson.rb +1 -3
- data/lib/puppet/indirector/catalog/active_record.rb +3 -0
- data/lib/puppet/indirector/catalog/compiler.rb +1 -2
- data/lib/puppet/indirector/catalog/queue.rb +4 -0
- data/lib/puppet/indirector/catalog/static_compiler.rb +30 -0
- data/lib/puppet/indirector/catalog/store_configs.rb +3 -0
- data/lib/puppet/indirector/certificate_request/rest.rb +1 -0
- data/lib/puppet/indirector/certificate_revocation_list/rest.rb +1 -0
- data/lib/puppet/indirector/certificate_status/file.rb +4 -0
- data/lib/puppet/indirector/certificate_status/rest.rb +1 -0
- data/lib/puppet/indirector/facts/active_record.rb +3 -0
- data/lib/puppet/indirector/facts/couch.rb +3 -0
- data/lib/puppet/indirector/facts/inventory_active_record.rb +4 -0
- data/lib/puppet/indirector/facts/store_configs.rb +3 -0
- data/lib/puppet/indirector/file_metadata/rest.rb +2 -0
- data/lib/puppet/indirector/instrumentation_data/local.rb +3 -0
- data/lib/puppet/indirector/instrumentation_data/rest.rb +3 -0
- data/lib/puppet/indirector/instrumentation_listener/local.rb +3 -0
- data/lib/puppet/indirector/instrumentation_listener/rest.rb +3 -0
- data/lib/puppet/indirector/instrumentation_probe/local.rb +3 -0
- data/lib/puppet/indirector/instrumentation_probe/rest.rb +3 -0
- data/lib/puppet/indirector/node/active_record.rb +3 -0
- data/lib/puppet/indirector/node/rest.rb +2 -2
- data/lib/puppet/indirector/node/store_configs.rb +3 -0
- data/lib/puppet/indirector/node/write_only_yaml.rb +32 -0
- data/lib/puppet/indirector/queue.rb +0 -1
- data/lib/puppet/indirector/request.rb +1 -2
- data/lib/puppet/indirector/resource/active_record.rb +4 -0
- data/lib/puppet/indirector/resource/ral.rb +3 -0
- data/lib/puppet/indirector/resource/rest.rb +3 -0
- data/lib/puppet/indirector/resource/store_configs.rb +3 -0
- data/lib/puppet/indirector/run/local.rb +3 -0
- data/lib/puppet/indirector/ssl_file.rb +16 -14
- data/lib/puppet/indirector/status/local.rb +3 -0
- data/lib/puppet/indirector/status/rest.rb +4 -0
- data/lib/puppet/interface.rb +78 -3
- data/lib/puppet/interface/action.rb +39 -3
- data/lib/puppet/interface/action_builder.rb +74 -1
- data/lib/puppet/interface/action_manager.rb +33 -3
- data/lib/puppet/interface/documentation.rb +116 -5
- data/lib/puppet/interface/face_collection.rb +6 -7
- data/lib/puppet/interface/option.rb +10 -1
- data/lib/puppet/interface/option_builder.rb +29 -1
- data/lib/puppet/interface/option_manager.rb +21 -6
- data/lib/puppet/metatype/manager.rb +47 -9
- data/lib/puppet/module_tool.rb +0 -1
- data/lib/puppet/network/formats.rb +0 -2
- data/lib/puppet/node.rb +2 -3
- data/lib/puppet/node/environment.rb +14 -1
- data/lib/puppet/parameter.rb +309 -44
- data/lib/puppet/parameter/package_options.rb +5 -0
- data/lib/puppet/parameter/path.rb +26 -3
- data/lib/puppet/parameter/value.rb +30 -6
- data/lib/puppet/parameter/value_collection.rb +82 -20
- data/lib/puppet/parser.rb +3 -0
- data/lib/puppet/parser/ast/definition.rb +2 -5
- data/lib/puppet/parser/ast/hostclass.rb +2 -3
- data/lib/puppet/parser/ast/node.rb +2 -5
- data/lib/puppet/parser/ast/resourceparam.rb +1 -1
- data/lib/puppet/parser/compiler.rb +10 -0
- data/lib/puppet/parser/functions.rb +111 -7
- data/lib/puppet/parser/functions/create_resources.rb +23 -2
- data/lib/puppet/parser/functions/defined.rb +1 -1
- data/lib/puppet/parser/functions/extlookup.rb +2 -1
- data/lib/puppet/parser/functions/fail.rb +1 -1
- data/lib/puppet/parser/functions/file.rb +1 -1
- data/lib/puppet/parser/functions/fqdn_rand.rb +1 -1
- data/lib/puppet/parser/functions/generate.rb +1 -1
- data/lib/puppet/parser/functions/hiera.rb +1 -1
- data/lib/puppet/parser/functions/hiera_array.rb +1 -1
- data/lib/puppet/parser/functions/hiera_hash.rb +1 -1
- data/lib/puppet/parser/functions/hiera_include.rb +1 -1
- data/lib/puppet/parser/functions/include.rb +1 -1
- data/lib/puppet/parser/functions/inline_template.rb +1 -1
- data/lib/puppet/parser/functions/md5.rb +1 -1
- data/lib/puppet/parser/functions/realize.rb +1 -1
- data/lib/puppet/parser/functions/regsubst.rb +54 -57
- data/lib/puppet/parser/functions/require.rb +1 -0
- data/lib/puppet/parser/functions/search.rb +1 -1
- data/lib/puppet/parser/functions/sha1.rb +1 -1
- data/lib/puppet/parser/functions/shellquote.rb +1 -1
- data/lib/puppet/parser/functions/split.rb +1 -2
- data/lib/puppet/parser/functions/sprintf.rb +7 -10
- data/lib/puppet/parser/functions/tag.rb +1 -1
- data/lib/puppet/parser/functions/tagged.rb +1 -1
- data/lib/puppet/parser/functions/template.rb +1 -1
- data/lib/puppet/parser/functions/versioncmp.rb +1 -5
- data/lib/puppet/parser/parser_support.rb +11 -27
- data/lib/puppet/parser/scope.rb +48 -4
- data/lib/puppet/parser/type_loader.rb +31 -7
- data/lib/puppet/property.rb +304 -70
- data/lib/puppet/property/ensure.rb +14 -1
- data/lib/puppet/property/keyvalue.rb +17 -8
- data/lib/puppet/property/list.rb +3 -0
- data/lib/puppet/property/ordered_list.rb +7 -0
- data/lib/puppet/provider.rb +275 -53
- data/lib/puppet/provider/augeas/augeas.rb +17 -3
- data/lib/puppet/provider/confiner.rb +30 -1
- data/lib/puppet/provider/group/pw.rb +2 -2
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pkgin.rb +2 -0
- data/lib/puppet/provider/service/bsd.rb +1 -1
- data/lib/puppet/provider/service/freebsd.rb +10 -6
- data/lib/puppet/provider/service/init.rb +1 -1
- data/lib/puppet/provider/service/service.rb +1 -1
- data/lib/puppet/provider/user/pw.rb +2 -2
- data/lib/puppet/provider/user/useradd.rb +2 -3
- data/lib/puppet/reference/configuration.rb +6 -0
- data/lib/puppet/reports.rb +44 -4
- data/lib/puppet/reports/tagmail.rb +1 -1
- data/lib/puppet/resource.rb +38 -25
- data/lib/puppet/resource/type.rb +14 -6
- data/lib/puppet/settings.rb +66 -142
- data/lib/puppet/settings/config_file.rb +99 -0
- data/lib/puppet/settings/file_setting.rb +92 -24
- data/lib/puppet/settings/value_translator.rb +15 -0
- data/lib/puppet/ssl/certificate_authority/interface.rb +2 -2
- data/lib/puppet/test/test_helper.rb +8 -3
- data/lib/puppet/transaction.rb +1 -2
- data/lib/puppet/transaction/report.rb +122 -13
- data/lib/puppet/type.rb +763 -150
- data/lib/puppet/type/augeas.rb +4 -0
- data/lib/puppet/type/file/ensure.rb +1 -1
- data/lib/puppet/type/file/group.rb +1 -1
- data/lib/puppet/type/file/mode.rb +2 -0
- data/lib/puppet/type/file/selcontext.rb +1 -0
- data/lib/puppet/type/group.rb +12 -0
- data/lib/puppet/type/mount.rb +2 -2
- data/lib/puppet/type/notify.rb +1 -1
- data/lib/puppet/type/router.rb +1 -1
- data/lib/puppet/type/service.rb +1 -0
- data/lib/puppet/type/ssh_authorized_key.rb +3 -1
- data/lib/puppet/type/user.rb +8 -1
- data/lib/puppet/util.rb +8 -0
- data/lib/puppet/util/autoload.rb +7 -10
- data/lib/puppet/util/classgen.rb +58 -33
- data/lib/puppet/util/command_line.rb +120 -77
- data/lib/puppet/util/constant_inflector.rb +2 -0
- data/lib/puppet/util/execution.rb +63 -33
- data/lib/puppet/util/filetype.rb +1 -1
- data/lib/puppet/util/manifest_filetype_helper.rb +22 -0
- data/lib/puppet/util/methodhelper.rb +19 -0
- data/lib/puppet/util/monkey_patches.rb +46 -0
- data/lib/puppet/util/plugins.rb +2 -2
- data/lib/puppet/util/provider_features.rb +24 -8
- data/lib/puppet/util/rubygems.rb +8 -1
- data/lib/puppet/util/zaml.rb +1 -1
- data/lib/puppet/version.rb +74 -3
- data/spec/integration/application/apply_spec.rb +1 -1
- data/spec/integration/defaults_spec.rb +1 -0
- data/spec/integration/dsl/classes_spec.rb +191 -0
- data/spec/integration/dsl/defaults_spec.rb +38 -0
- data/spec/integration/dsl/definitions_spec.rb +73 -0
- data/spec/integration/dsl/functions_spec.rb +95 -0
- data/spec/integration/dsl/nodes_spec.rb +96 -0
- data/spec/integration/dsl/params_spec.rb +146 -0
- data/spec/integration/dsl/relationships_spec.rb +46 -0
- data/spec/integration/dsl/resources_spec.rb +202 -0
- data/spec/integration/dsl/type_loading_spec.rb +64 -0
- data/spec/integration/indirector/catalog/queue_spec.rb +1 -1
- data/spec/integration/network/formats_spec.rb +32 -45
- data/spec/integration/parser/collector_spec.rb +105 -25
- data/spec/integration/parser/scope_spec.rb +64 -1
- data/spec/integration/resource/catalog_spec.rb +2 -4
- data/spec/integration/type/package_spec.rb +1 -1
- data/spec/lib/matchers/catalog.rb +50 -0
- data/spec/lib/puppet_spec/compiler.rb +11 -0
- data/spec/lib/puppet_spec/dsl.rb +29 -0
- data/spec/spec_helper.rb +17 -3
- data/spec/unit/application/agent_spec.rb +0 -1
- data/spec/unit/application/apply_spec.rb +1 -1
- data/spec/unit/application/face_base_spec.rb +11 -4
- data/spec/unit/application/indirection_base_spec.rb +4 -8
- data/spec/unit/application/kick_spec.rb +5 -2
- data/spec/unit/application/master_spec.rb +0 -6
- data/spec/unit/application_spec.rb +38 -14
- data/spec/unit/dsl/actions_spec.rb +402 -0
- data/spec/unit/dsl/blank_slate_spec.rb +27 -0
- data/spec/unit/dsl/context_spec.rb +678 -0
- data/spec/unit/dsl/parser_spec.rb +56 -0
- data/spec/unit/dsl/resource_decorator_spec.rb +94 -0
- data/spec/unit/dsl/resource_reference_spec.rb +150 -0
- data/spec/unit/dsl/type_reference_spec.rb +164 -0
- data/spec/unit/face/help_spec.rb +5 -7
- data/spec/unit/indirector/certificate_request/rest_spec.rb +4 -0
- data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +4 -0
- data/spec/unit/indirector/certificate_status/rest_spec.rb +4 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +5 -0
- data/spec/unit/indirector/hiera_spec.rb +3 -1
- data/spec/unit/indirector/queue_spec.rb +1 -7
- data/spec/unit/indirector/ssl_file_spec.rb +66 -39
- data/spec/unit/module_spec.rb +1 -1
- data/spec/unit/network/authstore_spec.rb +22 -1
- data/spec/unit/network/formats_spec.rb +1 -1
- data/spec/unit/node/environment_spec.rb +13 -0
- data/spec/unit/parser/collector_spec.rb +1 -1
- data/spec/unit/parser/compiler_spec.rb +26 -0
- data/spec/unit/parser/functions/create_resources_spec.rb +12 -1
- data/spec/unit/parser/functions/extlookup_spec.rb +4 -4
- data/spec/unit/parser/functions/hiera_array_spec.rb +1 -1
- data/spec/unit/parser/functions/hiera_hash_spec.rb +1 -1
- data/spec/unit/parser/functions/hiera_include_spec.rb +1 -1
- data/spec/unit/parser/functions/hiera_spec.rb +1 -1
- data/spec/unit/parser/functions/regsubst_spec.rb +4 -4
- data/spec/unit/parser/functions/split_spec.rb +4 -4
- data/spec/unit/parser/functions/sprintf_spec.rb +2 -2
- data/spec/unit/parser/functions/versioncmp_spec.rb +4 -4
- data/spec/unit/parser/functions_spec.rb +51 -1
- data/spec/unit/parser/parser_spec.rb +0 -14
- data/spec/unit/parser/type_loader_spec.rb +15 -1
- data/spec/unit/provider/augeas/augeas_spec.rb +31 -0
- data/spec/unit/provider/package/apt_spec.rb +0 -2
- data/spec/unit/provider/package/pip_spec.rb +12 -2
- data/spec/unit/provider/service/freebsd_spec.rb +8 -0
- data/spec/unit/provider/service/gentoo_spec.rb +20 -20
- data/spec/unit/provider/service/openrc_spec.rb +20 -20
- data/spec/unit/provider/service/src_spec.rb +4 -4
- data/spec/unit/provider/service/systemd_spec.rb +0 -8
- data/spec/unit/provider/service/windows_spec.rb +1 -1
- data/spec/unit/provider/user/useradd_spec.rb +2 -9
- data/spec/unit/relationship_spec.rb +2 -2
- data/spec/unit/resource/catalog_spec.rb +2 -2
- data/spec/unit/resource/type_spec.rb +49 -25
- data/spec/unit/resource_spec.rb +34 -2
- data/spec/unit/settings/config_file_spec.rb +100 -0
- data/spec/unit/settings/file_setting_spec.rb +87 -84
- data/spec/unit/settings/value_translator_spec.rb +77 -0
- data/spec/unit/settings_spec.rb +96 -29
- data/spec/unit/type/file/ensure_spec.rb +75 -36
- data/spec/unit/type/file_spec.rb +0 -68
- data/spec/unit/type/group_spec.rb +10 -0
- data/spec/unit/util/autoload_spec.rb +6 -0
- data/spec/unit/util/command_line_spec.rb +54 -62
- data/spec/unit/util/manifest_filetype_helper_spec.rb +29 -0
- data/spec/unit/util/metric_spec.rb +0 -9
- data/spec/unit/util/posix_spec.rb +0 -4
- data/spec/unit/util/rdoc_spec.rb +0 -12
- data/spec/unit/util/zaml_spec.rb +188 -130
- data/spec/unit/version_spec.rb +42 -0
- metadata +123 -90
- data/README_HIERA.md +0 -148
- data/conf/epm.list +0 -8
- data/conf/namespaceauth.conf +0 -20
- data/conf/puppet-queue.conf +0 -10
- data/examples/allatonce +0 -13
- data/examples/assignments +0 -11
- data/examples/components +0 -73
- data/examples/etc/init.d/sleeper +0 -70
- data/examples/etc/otherfile +0 -0
- data/examples/etc/puppet/fileserver.conf +0 -13
- data/examples/etc/puppet/namespaceauth.conf +0 -20
- data/examples/etc/puppet/puppet.conf +0 -10
- data/examples/etc/puppet/tagmail.conf +0 -1
- data/examples/execs +0 -16
- data/examples/file.bl +0 -11
- data/examples/filedefaults +0 -10
- data/examples/fileparsing +0 -116
- data/examples/filerecursion +0 -15
- data/examples/functions +0 -3
- data/examples/groups +0 -7
- data/examples/head +0 -30
- data/examples/importing +0 -8
- data/examples/mac_dscl.pp +0 -28
- data/examples/mac_dscl_revert.pp +0 -26
- data/examples/mac_pkgdmg.pp +0 -7
- data/examples/modules/sample_module.pp +0 -10
- data/examples/modules/sample_module/lib/puppet/parser/functions/hostname_to_dn.rb +0 -36
- data/examples/modules/sample_module/manifests/init.pp +0 -12
- data/examples/modules/sample_module/templates/sample.erb +0 -5
- data/examples/nodes +0 -20
- data/examples/one +0 -8
- data/examples/relationships +0 -34
- data/examples/selectors +0 -28
- data/examples/simpletests +0 -11
- data/examples/svncommit +0 -13
- data/lib/puppet/dsl/resource_api.rb +0 -120
- data/lib/puppet/dsl/resource_type_api.rb +0 -34
- data/spec/integration/parser/ruby_manifest_spec.rb +0 -127
- data/spec/unit/dsl/resource_api_spec.rb +0 -180
- data/spec/unit/dsl/resource_type_api_spec.rb +0 -53
data/README_HIERA.md
DELETED
@@ -1,148 +0,0 @@
|
|
1
|
-
What?
|
2
|
-
=====
|
3
|
-
|
4
|
-
A data backend for Hiera that can query the internal Puppet
|
5
|
-
scope for data. The data structure and approach is heavily
|
6
|
-
based on work by Nigel Kersten but made more configurable and
|
7
|
-
with full hierarchy.
|
8
|
-
|
9
|
-
It also includes a Puppet function that works like extlookup()
|
10
|
-
but uses the Hiera backends.
|
11
|
-
|
12
|
-
Usage?
|
13
|
-
======
|
14
|
-
|
15
|
-
Hiera supports the concept of chaining backends together in order,
|
16
|
-
using this we can create a very solid module author/module user
|
17
|
-
experience.
|
18
|
-
|
19
|
-
Module Author
|
20
|
-
-------------
|
21
|
-
|
22
|
-
A module author wants to create a configurable module that has sane
|
23
|
-
defaults but want to retain the ability for users to configure it.
|
24
|
-
|
25
|
-
We'll use a simple NTP config class as an example.
|
26
|
-
|
27
|
-
<pre>
|
28
|
-
class ntp::config($ntpservers = hiera("ntpservers")) {
|
29
|
-
file{"/etc/ntp.conf":
|
30
|
-
content => template("ntp.conf.erb")
|
31
|
-
}
|
32
|
-
}
|
33
|
-
</pre>
|
34
|
-
|
35
|
-
We create a class that takes as parameters a list of NTP servers.
|
36
|
-
|
37
|
-
The module author wants to create a works-out-of-the-box experience
|
38
|
-
so creates a data class for the NTP module:
|
39
|
-
|
40
|
-
<pre>
|
41
|
-
class ntp::data {
|
42
|
-
$ntpservers = ["1.pool.ntp.org", "2.pool.ntp.org"]
|
43
|
-
}
|
44
|
-
</pre>
|
45
|
-
|
46
|
-
Together this creates a default sane setup.
|
47
|
-
|
48
|
-
Module User
|
49
|
-
-----------
|
50
|
-
|
51
|
-
The module user has a complex multi data center setup, he wants to use
|
52
|
-
the NTP module from the forge and configure it for his needs.
|
53
|
-
|
54
|
-
The user creates a set of default data for his organization, he can do
|
55
|
-
this in data files or in Puppet. We'll show a Puppet example.
|
56
|
-
|
57
|
-
<pre>
|
58
|
-
class data::common {
|
59
|
-
$ntpservers = ["ntp1.example.com", "ntp2.example.com"]
|
60
|
-
}
|
61
|
-
</pre>
|
62
|
-
|
63
|
-
Being part of the actual code this data is subject to strict change
|
64
|
-
control. This is needed as its data that can potentially affect all
|
65
|
-
machines in all locations.
|
66
|
-
|
67
|
-
The user has a fact called _location_ that contains, for example, a name
|
68
|
-
of the data center.
|
69
|
-
|
70
|
-
He decides to create JSON based data for the data centers, being just data
|
71
|
-
that applies to one data center this data is not subject to as strict
|
72
|
-
change controls and so does not live with the code:
|
73
|
-
|
74
|
-
He creates _/var/lib/hiera/dc1.json_ with the following:
|
75
|
-
|
76
|
-
<pre>
|
77
|
-
{"ntpservers" : ["ntp1.dc1.example.com", "ntp2.dc1.example.com"]}
|
78
|
-
</pre>
|
79
|
-
|
80
|
-
Machines in dc1 will now use specific NTP servers while all the rest will
|
81
|
-
use the data in _data::common_
|
82
|
-
|
83
|
-
The module user can now just declare the class on his nodes:
|
84
|
-
|
85
|
-
<pre>
|
86
|
-
node "web1" {
|
87
|
-
include ntp::config
|
88
|
-
}
|
89
|
-
</pre>
|
90
|
-
|
91
|
-
For true one-off changes, the user can use the full paramterized class approach
|
92
|
-
that will completely disable the Hiera handling of this data item. He could
|
93
|
-
also use an ENC to supply this data.
|
94
|
-
|
95
|
-
<pre>
|
96
|
-
node "web2" {
|
97
|
-
class{"ntp::config": ntpservers => ["another.example.com"]}
|
98
|
-
}
|
99
|
-
</pre>
|
100
|
-
|
101
|
-
This behavior is thanks to Hiera's ability to search through multiple backends
|
102
|
-
for data picking the first match. We can have the JSON searched before the internal
|
103
|
-
Puppet data.
|
104
|
-
|
105
|
-
To achieve this setup the module user needs to configure Hiera in _/etc/puppet/hiera.yaml_:
|
106
|
-
|
107
|
-
<pre>
|
108
|
-
---
|
109
|
-
:backends:
|
110
|
-
- json
|
111
|
-
- puppet
|
112
|
-
|
113
|
-
:hierarchy:
|
114
|
-
- "%{location}"
|
115
|
-
- common
|
116
|
-
|
117
|
-
:json:
|
118
|
-
:datadir: /var/lib/hiera
|
119
|
-
|
120
|
-
:puppet:
|
121
|
-
:datasource: data
|
122
|
-
</pre>
|
123
|
-
|
124
|
-
Converting from extlookup?
|
125
|
-
==========================
|
126
|
-
|
127
|
-
A simple converter is included called _extlookup2hiera_ and it can convert from CSV to JSON or YAML:
|
128
|
-
|
129
|
-
<pre>
|
130
|
-
$ extlookup2hiera --in common.csv --out common.json --json
|
131
|
-
</pre>
|
132
|
-
|
133
|
-
Installation?
|
134
|
-
=============
|
135
|
-
|
136
|
-
It's not 100% ready for prime time, shortly a simple _gem install hiera-puppet_ on your master will do it.
|
137
|
-
|
138
|
-
For the moment the Gem install will place the Puppet Parser Function where Puppet cannot find it, you should
|
139
|
-
copy it out and distribute it to your master using Pluginsync or something similar
|
140
|
-
|
141
|
-
License
|
142
|
-
=======
|
143
|
-
|
144
|
-
See LICENSE file.
|
145
|
-
|
146
|
-
Support
|
147
|
-
=======
|
148
|
-
Please log tickets and issues at our [Projects site](http://projects.puppetlabs.com)
|
data/conf/epm.list
DELETED
data/conf/namespaceauth.conf
DELETED
@@ -1,20 +0,0 @@
|
|
1
|
-
# This is an example namespaceauth.conf file,
|
2
|
-
# which you'll need if you want to start a client
|
3
|
-
# in --listen mode.
|
4
|
-
[fileserver]
|
5
|
-
allow *.domain.com
|
6
|
-
|
7
|
-
[puppetmaster]
|
8
|
-
allow *.domain.com
|
9
|
-
|
10
|
-
[puppetrunner]
|
11
|
-
allow culain.domain.com
|
12
|
-
|
13
|
-
[puppetbucket]
|
14
|
-
allow *.domain.com
|
15
|
-
|
16
|
-
[puppetreports]
|
17
|
-
allow *.domain.com
|
18
|
-
|
19
|
-
[resource]
|
20
|
-
allow server.domain.com
|
data/conf/puppet-queue.conf
DELETED
data/examples/allatonce
DELETED
data/examples/assignments
DELETED
data/examples/components
DELETED
@@ -1,73 +0,0 @@
|
|
1
|
-
# $Id$
|
2
|
-
|
3
|
-
# i still have no 'require'-like functionality, and i should also
|
4
|
-
# have 'recommend'-like functionality...
|
5
|
-
define apache(php,docroot,user,group) {
|
6
|
-
package { apache:
|
7
|
-
version => "2.0.53"
|
8
|
-
}
|
9
|
-
service { apache:
|
10
|
-
running => true
|
11
|
-
}
|
12
|
-
|
13
|
-
|
14
|
-
# this definitely won't parse
|
15
|
-
#if $php == "true" {
|
16
|
-
# # this needs to do two things:
|
17
|
-
# # - mark a dependency
|
18
|
-
# # - cause this apache component to receive refresh events generated by php
|
19
|
-
# #require("php")
|
20
|
-
# $var = value
|
21
|
-
#}
|
22
|
-
|
23
|
-
#file { "../examples/root/etc/configfile":
|
24
|
-
# owner => $user
|
25
|
-
#}
|
26
|
-
}
|
27
|
-
|
28
|
-
define sudo() {
|
29
|
-
package { sudo:
|
30
|
-
version => "1.6.8p7"
|
31
|
-
}
|
32
|
-
file { "/etc/sudoers":
|
33
|
-
owner => root,
|
34
|
-
group => root,
|
35
|
-
mode => "440"
|
36
|
-
}
|
37
|
-
}
|
38
|
-
|
39
|
-
define ssh {
|
40
|
-
package { ssh:
|
41
|
-
version => "3.4.4.4"
|
42
|
-
}
|
43
|
-
service { "sshd":
|
44
|
-
running => true
|
45
|
-
}
|
46
|
-
}
|
47
|
-
|
48
|
-
define sleeper(path,mode) {
|
49
|
-
Service {
|
50
|
-
path => "../examples/root/etc/init.d"
|
51
|
-
}
|
52
|
-
|
53
|
-
service { sleeper:
|
54
|
-
running => true,
|
55
|
-
path => "../examples/root/etc/init.d"
|
56
|
-
}
|
57
|
-
file { $path:
|
58
|
-
mode => $mode
|
59
|
-
}
|
60
|
-
$files = ["/tmp/testness","/tmp/funtest"]
|
61
|
-
file { $files:
|
62
|
-
ensure => file
|
63
|
-
}
|
64
|
-
}
|
65
|
-
|
66
|
-
#apache { "test":
|
67
|
-
# php => false,
|
68
|
-
# docroot => "/export/html",
|
69
|
-
# user => "www-data",
|
70
|
-
# group => "www-data"
|
71
|
-
#}
|
72
|
-
|
73
|
-
#ssh { "yucko":}
|
data/examples/etc/init.d/sleeper
DELETED
@@ -1,70 +0,0 @@
|
|
1
|
-
#!/bin/bash
|
2
|
-
|
3
|
-
script=$0
|
4
|
-
path=`echo $script | sed 's/etc..*/bin/'`
|
5
|
-
|
6
|
-
PATH=$PATH:$path
|
7
|
-
|
8
|
-
ps=`facter ps`
|
9
|
-
|
10
|
-
if [ -z "$ps" ]; then
|
11
|
-
ps="ps -ef"
|
12
|
-
fi
|
13
|
-
|
14
|
-
function start
|
15
|
-
{
|
16
|
-
cd $path
|
17
|
-
./sleeper
|
18
|
-
}
|
19
|
-
|
20
|
-
function stop
|
21
|
-
{
|
22
|
-
#if [ -n `which pgrep` ]; then
|
23
|
-
# pid=`pgrep sleeper`
|
24
|
-
#else
|
25
|
-
pid=`$ps | grep -v grep | grep sleeper | grep ruby | awk '{print $2}'`
|
26
|
-
#fi
|
27
|
-
if [ -n "$pid" ]; then
|
28
|
-
kill $pid
|
29
|
-
fi
|
30
|
-
}
|
31
|
-
|
32
|
-
function restart
|
33
|
-
{
|
34
|
-
stop
|
35
|
-
start
|
36
|
-
}
|
37
|
-
|
38
|
-
function status
|
39
|
-
{
|
40
|
-
#if [ -n `which pgrep` ]; then
|
41
|
-
# cmd="pgrep sleeper"
|
42
|
-
#else
|
43
|
-
#cmd="$ps | grep -v grep | grep sleeper | grep ruby | awk '{print $2}'"
|
44
|
-
#fi
|
45
|
-
#$cmd
|
46
|
-
$ps | grep -v grep | grep sleeper | grep ruby
|
47
|
-
}
|
48
|
-
|
49
|
-
case "$1" in
|
50
|
-
start)
|
51
|
-
start
|
52
|
-
;;
|
53
|
-
stop)
|
54
|
-
stop
|
55
|
-
;;
|
56
|
-
restart)
|
57
|
-
stop; start
|
58
|
-
;;
|
59
|
-
status)
|
60
|
-
output=`status`
|
61
|
-
#status
|
62
|
-
exit $?
|
63
|
-
;;
|
64
|
-
*)
|
65
|
-
echo "Usage: $N {start|stop|restart|force-reload}" >&2
|
66
|
-
exit 1
|
67
|
-
;;
|
68
|
-
esac
|
69
|
-
|
70
|
-
exit 0
|
data/examples/etc/otherfile
DELETED
File without changes
|
@@ -1,20 +0,0 @@
|
|
1
|
-
# This file is only necessary if your clients listen.
|
2
|
-
# Note that it affects all puppet daemons, including puppetmasterd,
|
3
|
-
# which is why puppetmaster is in there.
|
4
|
-
[fileserver]
|
5
|
-
allow *.madstop.com
|
6
|
-
|
7
|
-
[puppetmaster]
|
8
|
-
allow *.madstop.com
|
9
|
-
|
10
|
-
[pelementserver]
|
11
|
-
allow puppet.madstop.com
|
12
|
-
|
13
|
-
[puppetrunner]
|
14
|
-
allow culain.madstop.com
|
15
|
-
|
16
|
-
[puppetbucket]
|
17
|
-
allow *.madstop.com
|
18
|
-
|
19
|
-
[puppetreports]
|
20
|
-
allow *.madstop.com
|
@@ -1 +0,0 @@
|
|
1
|
-
all: user@domain.com
|
data/examples/execs
DELETED