--- a/components/ruby/puppet-solaris/files/puppet.xml Tue May 03 12:46:52 2016 -0700
+++ b/components/ruby/puppet-solaris/files/puppet.xml Tue May 03 15:56:45 2016 -0700
@@ -19,7 +19,7 @@
CDDL HEADER END
- Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
NOTE: This service manifest is not editable; its contents will
be overwritten by package or patch operations, including
@@ -66,7 +66,7 @@
<stability value="Unstable"/>
<template>
<common_name>
- <loctext xml:lang="C">Puppet version 3.6.2</loctext>
+ <loctext xml:lang="C">Puppet version 3.8.6</loctext>
</common_name>
<documentation>
<manpage title="puppet-master" section="8" manpath="/usr/share/man"/>
@@ -111,6 +111,25 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="boolean" name="always_cache_features">
+ <description>
+ <loctext xml:lang="C">
+Affects how we cache attempts to load Puppet 'features'. If false, then
+calls to `Puppet.features.<feature>?` will always attempt to load the
+feature (which can be an expensive operation) unless it has already been
+loaded successfully. This makes it possible for a single agent run to,
+e.g., install a package that provides the underlying capabilities for
+a feature, and then later load that feature during the same run (even if
+the feature had been tested earlier and had not been available).
+
+If this setting is set to true, then features will only be checked once,
+and if they are not available, the negative result is cached and returned
+for all subsequent attempts to load the feature. This behavior is almost
+always appropriate for the server, and can result in a significant performance
+improvement for features that are checked frequently.
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="host" name="archive_file_server">
<description>
<loctext xml:lang="C">
@@ -187,15 +206,6 @@
</loctext>
</description>
</prop_pattern>
- <prop_pattern required="false" type="boolean" name="biff">
- <description>
- <loctext xml:lang="C">
-Turns on Biff the catalog builder, future parser, and future evaluator.
-This is an experimental feature - and this setting may go away before
-release of Pupet 3.6.
- </loctext>
- </description>
- </prop_pattern>
<prop_pattern required="false" type="net_address" name="bindaddress">
<description>
<loctext xml:lang="C">
@@ -390,8 +400,36 @@
<prop_pattern required="false" type="hostname" name="certname">
<description>
<loctext xml:lang="C">
-The name to use when handling certificates. Defaults
-to the fully qualified domain name.
+The name to use when handling certificates. When a node
+requests a certificate from the CA puppet master, it uses the value of the
+`certname` setting as its requested Subject CN.
+
+This is the name used when managing a node's permissions in
+[auth.conf](http://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
+In most cases, it is also used as the node's name when matching
+[node definitions](http://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
+and requesting data from an ENC. (This can be changed with the `node_name_value`
+and `node_name_fact` settings, although you should only do so if you have
+a compelling reason.)
+
+A node's certname is available in Puppet manifests as `$trusted['certname']`. (See
+[Facts and Built-In Variables](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
+for more details.)
+
+* For best compatibility, you should limit the value of `certname` to
+ only use letters, numbers, periods, underscores, and dashes. (That is,
+ it should match `/A[a-z0-9._-]+Z/`.)
+* The special value `ca` is reserved, and can't be used as the certname
+ for a normal node.
+
+Defaults to the node's fully qualified domain name.
+ </loctext>
+ </description>
+ </prop_pattern>
+ <prop_pattern required="false" type="boolean" name="cfacter">
+ <description>
+ <loctext xml:lang="C">
+Whether or not to use the native facter (cfacter) implementation instead of the Ruby one (facter). Defaults to false.
</loctext>
</description>
</prop_pattern>
@@ -649,6 +687,23 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="astring" name="default_manifest">
+ <description>
+ <loctext xml:lang="C">
+The default main manifest for directory environments. Any environment that
+doesn't set the `manifest` setting in its `environment.conf` file will use
+this manifest.
+
+This setting's value can be an absolute or relative path. An absolute path
+will make all environments default to the same main manifest; a relative
+path will allow each environment to use its own manifest, and Puppet will
+resolve the path relative to each environment's main directory.
+
+In either case, the path can point to a single file or to a directory of
+manifests to be evaluated in alphabetical order.
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="boolean" name="default_schedules">
<description>
<loctext xml:lang="C">
@@ -696,11 +751,31 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="boolean" name="disable_per_environment_manifest">
+ <description>
+ <loctext xml:lang="C">
+Whether to disallow an environment-specific main manifest. When set
+to `true`, Puppet will use the manifest specified in the `default_manifest` setting
+for all environments. If an environment specifies a different main manifest in its
+`environment.conf` file, catalog requests for that environment will fail with an error.
+
+This setting requires `default_manifest` to be set to an absolute path.
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="astring" name="disable_warnings">
<description>
<loctext xml:lang="C">
-A list of warning types to disable. Currently the only warning type that can be
-disabled are deprecations, but more warning types may be added later.
+A comma-separated list of warning types to suppress. If large numbers
+of warnings are making Puppet's logs too large or difficult to use, you
+can temporarily silence them with this setting.
+
+If you are preparing to upgrade Puppet to a new major version, you
+should re-enable all warnings for a while.
+
+Valid values for this setting are:
+
+* `deprecations` --- disables deprecation warnings.
</loctext>
</description>
</prop_pattern>
@@ -756,8 +831,33 @@
<prop_pattern required="false" type="integer" name="environment_timeout">
<description>
<loctext xml:lang="C">
-The time to live for a cached environment. The time is either given This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)., or
-the word 'unlimited' which causes the environment to be cached until the master is restarted.
+How long the Puppet master should cache data it loads from an
+environment.
+This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+A value of `0` will disable caching. This setting can also be set to
+`unlimited`, which will cache environments until the master is restarted
+or told to refresh the cache.
+
+You should change this setting once your Puppet deployment is doing
+non-trivial work. We chose the default value of `0` because it lets new
+users update their code without any extra steps, but it lowers the
+performance of your Puppet master.
+
+We recommend setting this to `unlimited` and explicitly refreshing your
+Puppet master as part of your code deployment process.
+
+* With Puppet Server, you should refresh environments by calling the
+ `environment-cache` API endpoint. See the docs for the Puppet Server
+ administrative API.
+* With a Rack Puppet master, you should restart the web server or the
+ application server. Passenger lets you touch a `restart.txt` file to
+ refresh an application without restarting Apache; see the Passenger docs
+ for details.
+
+We don't recommend using any value other than `0` or `unlimited`, since
+most Puppet masters use a pool of Ruby interpreters which all have their
+own cache timers. When these timers drift out of sync, agents can be served
+inconsistent catalogs.
</loctext>
</description>
</prop_pattern>
@@ -783,29 +883,6 @@
</loctext>
</description>
</prop_pattern>
- <prop_pattern required="false" type="astring" name="evaluator">
- <description>
- <loctext xml:lang="C">
-Which evaluator to use when compiling Puppet manifests. Valid values
-are `current` and `future` (the default).
-
-**Note:** This setting is only used when `parser = future`. It allows
-testers to turn off the `future` evaluator when doing detailed tests and
-comparisons of the new compilation system.
-
-Evaluation is the second stage of catalog compilation. After the parser
-converts a manifest to a model of expressions, the evaluator processes
-each expression. (For example, a resource declaration signals the
-evaluator to add a resource to the catalog).
-
-The `future` parser and evaluator are slated to become default in Puppet
-4. Their purpose is to add new features and improve consistency
-and reliability.
-
-Available Since Puppet 3.5.
- </loctext>
- </description>
- </prop_pattern>
<prop_pattern required="false" type="astring" name="external_nodes">
<description>
<loctext xml:lang="C">
@@ -852,6 +929,13 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="astring" name="forge_authorization">
+ <description>
+ <loctext xml:lang="C">
+The authorization key to connect to the Puppet Forge. Leave blank for unauthorized or license based connections
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="boolean" name="freeze_main">
<description>
<loctext xml:lang="C">
@@ -949,11 +1033,39 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="boolean" name="http_debug">
+ <description>
+ <loctext xml:lang="C">
+Whether to write HTTP request and responses to stderr. This should never be used in a production environment.
+ </loctext>
+ </description>
+ </prop_pattern>
+ <prop_pattern required="false" type="integer" name="http_keepalive_timeout">
+ <description>
+ <loctext xml:lang="C">
+The maximum amount of time a persistent HTTP connection can remain idle in the connection pool, before it is closed. This timeout should be shorter than the keepalive timeout used on the HTTP server, e.g. Apache KeepAliveTimeout directive.
+This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="host" name="http_proxy_host">
<description>
<loctext xml:lang="C">
The HTTP proxy host to use for outgoing connections. Note: You
-may need to use a FQDN for the server hostname when using a proxy.
+may need to use a FQDN for the server hostname when using a proxy. Environment variable
+http_proxy or HTTP_PROXY will override this value
+ </loctext>
+ </description>
+ </prop_pattern>
+ <prop_pattern required="false" type="astring" name="http_proxy_password">
+ <description>
+ <loctext xml:lang="C">
+The password for the user of an authenticated HTTP proxy.
+Requires the `http_proxy_user` setting.
+
+Note that passwords must be valid when used as part of a URL. If a password
+contains any characters with special meanings in URLs (as specified by RFC 3986
+` would become `%23`.)
</loctext>
</description>
</prop_pattern>
@@ -964,6 +1076,13 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="astring" name="http_proxy_user">
+ <description>
+ <loctext xml:lang="C">
+The user name for an authenticated HTTP proxy. Requires the `http_proxy_host` setting.
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="astring" name="httplog">
<description>
<loctext xml:lang="C">
@@ -1210,7 +1329,16 @@
<prop_pattern required="false" type="astring" name="log_level">
<description>
<loctext xml:lang="C">
-Default logging level
+Default logging level for messages from Puppet. Allowed values are:
+
+* debug
+* info
+* notice
+* warning
+* err
+* alert
+* emerg
+* crit
</loctext>
</description>
</prop_pattern>
@@ -1255,15 +1383,21 @@
<prop_pattern required="false" type="astring" name="masterhttplog">
<description>
<loctext xml:lang="C">
-Where the puppet master web server logs.
+Where the puppet master web server saves its access log. This is
+only used when running a WEBrick puppet master. When puppet master is
+running under a Rack server like Passenger, that web server will have
+its own logging behavior.
</loctext>
</description>
</prop_pattern>
<prop_pattern required="false" type="astring" name="masterlog">
<description>
<loctext xml:lang="C">
-Where puppet master logs. This is generally not used,
-since syslog is the default log destination.
+This file is literally never used, although Puppet may create it
+as an empty file. For more context, see the `puppetdlog` setting and
+puppet master's `--logdest` command line option.
+
+This setting is deprecated and will be removed in a future version of Puppet.
</loctext>
</description>
</prop_pattern>
@@ -1280,8 +1414,8 @@
<description>
<loctext xml:lang="C">
Sets the max number of logged/displayed parser validation deprecation
-warnings in case multiple errors have been detected. A value of 0 is the
-same as value 1. The count is per manifest.
+warnings in case multiple deprecation warnings have been detected. A value of 0
+blocks the logging of deprecation warnings. The count is per manifest.
</loctext>
</description>
</prop_pattern>
@@ -1289,8 +1423,8 @@
<description>
<loctext xml:lang="C">
Sets the max number of logged/displayed parser validation errors in case
-multiple errors have been detected. A value of 0 is the same as value 1.
-The count is per manifest.
+multiple errors have been detected. A value of 0 is the same as a value of 1; a
+minimum of one error is always raised. The count is per manifest.
</loctext>
</description>
</prop_pattern>
@@ -1298,8 +1432,8 @@
<description>
<loctext xml:lang="C">
Sets the max number of logged/displayed parser validation warnings in
-case multiple errors have been detected. A value of 0 is the same as
-value 1. The count is per manifest.
+case multiple warnings have been detected. A value of 0 blocks logging of
+warnings. The count is per manifest.
</loctext>
</description>
</prop_pattern>
@@ -1321,6 +1455,13 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="astring" name="module_groups">
+ <description>
+ <loctext xml:lang="C">
+Extra module groups to request from the Puppet Forge
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="uri" name="module_repository">
<description>
<loctext xml:lang="C">
@@ -1479,7 +1620,7 @@
language/'.pp' files). Available choices are `current` (the default)
and `future`.
-The `curent` parser means that the released version of the parser should
+The `current` parser means that the released version of the parser should
be used.
The `future` parser is a "time travel to the future" allowing early
@@ -1589,6 +1730,13 @@
</loctext>
</description>
</prop_pattern>
+ <prop_pattern required="false" type="astring" name="preview_outputdir">
+ <description>
+ <loctext xml:lang="C">
+The directory where catalog previews per node are generated.
+ </loctext>
+ </description>
+ </prop_pattern>
<prop_pattern required="false" type="astring" name="priority">
<description>
<loctext xml:lang="C">
@@ -1631,7 +1779,18 @@
<prop_pattern required="false" type="astring" name="puppetdlog">
<description>
<loctext xml:lang="C">
-The log file for puppet agent. This is generally not used.
+The fallback log file. This is only used when the `--logdest` option
+is not specified AND Puppet is running on an operating system where both
+the POSIX syslog service and the Windows Event Log are unavailable. (Currently,
+no supported operating systems match that description.)
+
+Despite the name, both puppet agent and puppet master will use this file
+as the fallback logging destination.
+
+For control over logging destinations, see the `--logdest` command line
+option in the manual pages for puppet master, puppet agent, and puppet
+apply. You can see man pages by running `puppet <SUBCOMMAND> --help`,
+or read them online at http://docs.puppetlabs.com/references/latest/man/.
</loctext>
</description>
</prop_pattern>
@@ -2042,7 +2201,7 @@
<description>
<loctext xml:lang="C">
to_s. Means you can't have arrays or
-hashes as fact values.
+hashes as fact values. (DEPRECATED) This option will be removed in Puppet 4.0.
</loctext>
</description>
</prop_pattern>