openvox 9.0.0.pre.alpha2 → 9.0.0.pre.beta2

data/lib/puppet/application/agent.rb

@@ -110,12 +110,12 @@ class Puppet::Application::Agent < Puppet::Application
 
       DESCRIPTION
       -----------
-      This is the main puppet client. Its job is to retrieve the local
+      This is the main OpenVox client. Its job is to retrieve the local
       machine's configuration from a remote server and apply it. In order to
       successfully communicate with the remote server, the client must have a
       certificate signed by a certificate authority that the server trusts;
       the recommended method for this, at the moment, is to run a certificate
-      authority as part of the puppet server (which is the default). The
+      authority as part of the OpenVox server (which is the default). The
       client will connect and request a signed certificate, and will continue
       connecting until it receives one.
 
@@ -146,7 +146,7 @@ class Puppet::Application::Agent < Puppet::Application
       * 6: The run succeeded, and included both changes and failures.
 
       '--tags' allows you to specify what portions of a configuration you want
-      to apply. Puppet elements are tagged with all of the class or definition
+      to apply. OpenVox elements are tagged with all of the class or definition
       names that contain them, and you can use the 'tags' flag to specify one
       of these names, causing only configuration elements contained within
       that class or definition to be applied. This is very useful when you are
@@ -161,7 +161,7 @@ class Puppet::Application::Agent < Puppet::Application
       (or certificate request) fingerprint. Providing the '--digest' option
       allows you to use a different digest algorithm to generate the fingerprint.
       The main use is to verify that before signing a certificate request on
-      the master, the certificate request the master received is the same as
+      the server, the certificate request the server received is the same as
       the one the client sent (to prevent against man-in-the-middle attacks
       when signing certificates).
 
@@ -173,33 +173,33 @@ class Puppet::Application::Agent < Puppet::Application
       OPTIONS
       -------
 
-      Note that any Puppet setting that's valid in the configuration file is also a
+      Note that any OpenVox setting that's valid in the configuration file is also a
       valid long argument. For example, 'server' is a valid setting, so you can
       specify '--server <servername>' as an argument. Boolean settings accept a '--no-'
       prefix to turn off a behavior, translating into '--setting' and '--no-setting'
       pairs, such as `--daemonize` and `--no-daemonize`.
 
       See the configuration file documentation at
-      https://puppet.com/docs/puppet/latest/configuration.html for the
+      https://docs.openvoxproject.org/openvox/latest/configuration.html for the
       full list of acceptable settings. A commented list of all settings can also be
       generated by running puppet agent with '--genconfig'.
 
       * --certname:
-        Set the certname (unique ID) of the client. The master reads this
+        Set the certname (unique ID) of the client. The server reads this
         unique identifying string, which is usually set to the node's
         fully-qualified domain name, to determine which configurations the
         node will receive. Use this option to debug setup problems or
         implement unusual node identification schemes.
-        (This is a Puppet setting, and can go in puppet.conf.)
+        (This is an OpenVox setting, and can go in puppet.conf.)
 
       * --daemonize:
         Send the process into the background. This is the default.
-        (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+        (This is an OpenVox setting, and can go in puppet.conf. Note the special 'no-'
         prefix for boolean settings on the command line.)
 
       * --no-daemonize:
         Do not send the process into the background.
-        (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+        (This is an OpenVox setting, and can go in puppet.conf. Note the special 'no-'
         prefix for boolean settings on the command line.)
 
       * --debug:
@@ -251,7 +251,7 @@ class Puppet::Application::Agent < Puppet::Application
 
       *  --evaltrace:
         Logs each resource as it is being evaluated. This allows you to interactively
-        see exactly what is being done. (This is a Puppet setting, and can go in
+        see exactly what is being done. (This is an OpenVox setting, and can go in
         puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
       * --fingerprint:
@@ -264,9 +264,7 @@ class Puppet::Application::Agent < Puppet::Application
 
       * --job-id:
         Attach the specified job id to the catalog request and the report used for
-        this agent run. This option only works when '--onetime' is used.  When using
-        Puppet Enterprise this flag should not be used as the orchestrator sets the
-        job-id for you and it must be unique.
+        this agent run. This option only works when '--onetime' is used.
 
       * --logdest:
         Where to send log messages. Choose between 'syslog' (the POSIX syslog
@@ -285,31 +283,31 @@ class Puppet::Application::Agent < Puppet::Application
         format.
 
       * --masterport:
-        The port on which to contact the Puppet Server.
-        (This is a Puppet setting, and can go in puppet.conf.
+        The port on which to contact the OpenVox Server.
+        (This is an OpenVox setting, and can go in puppet.conf.
         Deprecated in favor of the 'serverport' setting.)
 
       * --noop:
         Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
-        is useful for seeing what changes Puppet would make without actually
+        is useful for seeing what changes OpenVox would make without actually
         executing the changes.
-        (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+        (This is an OpenVox setting, and can go in puppet.conf. Note the special 'no-'
         prefix for boolean settings on the command line.)
 
       * --onetime:
-        Run the configuration once. Runs a single (normally daemonized) Puppet
+        Run the configuration once. Runs a single (normally daemonized) OpenVox
         run. Useful for interactively running puppet agent when used in
         conjunction with the --no-daemonize option.
-        (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+        (This is an OpenVox setting, and can go in puppet.conf. Note the special 'no-'
         prefix for boolean settings on the command line.)
 
       * --serverport:
-        The port on which to contact the Puppet Server.
-        (This is a Puppet setting, and can go in puppet.conf.)
+        The port on which to contact the OpenVox Server.
+        (This is an OpenVox setting, and can go in puppet.conf.)
 
       * --sourceaddress:
         Set the source IP address for transactions. This defaults to automatically selected.
-        (This is a Puppet setting, and can go in puppet.conf.)
+        (This is an OpenVox setting, and can go in puppet.conf.)
 
       * --test:
         Enable the most common options used for testing. These are 'onetime',
@@ -317,28 +315,28 @@ class Puppet::Application::Agent < Puppet::Application
         'no-splay', and 'show_diff'.
 
       * --trace
-        Prints stack traces on some errors. (This is a Puppet setting, and can go in
+        Prints stack traces on some errors. (This is an OpenVox setting, and can go in
         puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
       * --verbose:
         Turn on verbose reporting.
 
       * --version:
-        Print the puppet version number and exit.
+        Print the OpenVox agent version number and exit.
 
       * --waitforcert:
         This option only matters for daemons that do not yet have certificates
         and it is enabled by default, with a value of 120 (seconds). This
         causes 'puppet agent' to connect to the server every 2 minutes and ask
         it to sign a certificate request. This is useful for the initial setup
-        of a puppet client. You can turn off waiting for certificates by
+        of an OpenVox client. You can turn off waiting for certificates by
         specifying a time of 0.
-        (This is a Puppet setting, and can go in puppet.conf.)
+        (This is an OpenVox setting, and can go in puppet.conf.)
 
       * --write_catalog_summary
         After compiling the catalog saves the resource list and classes list to the node
         in the state directory named classes.txt and resources.txt
-        (This is a Puppet setting, and can go in puppet.conf.)
+        (This is an OpenVox setting, and can go in puppet.conf.)
 
       EXAMPLE
       -------
@@ -348,14 +346,14 @@ class Puppet::Application::Agent < Puppet::Application
       DIAGNOSTICS
       -----------
 
-      Puppet agent accepts the following signals:
+      OpenVox agent accepts the following signals:
 
       * SIGHUP:
-        Restart the puppet agent daemon.
+        Restart the OpenVox agent daemon.
       * SIGINT and SIGTERM:
-        Shut down the puppet agent daemon.
+        Shut down the OpenVox agent daemon.
       * SIGUSR1:
-        Immediately retrieve and apply configurations from the puppet master.
+        Immediately retrieve and apply configurations from the OpenVox server.
       * SIGUSR2:
         Close file descriptors for log files and reopen them. Used with logrotate.
 
@@ -366,8 +364,8 @@ class Puppet::Application::Agent < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP
@@ -451,7 +449,7 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   def main(daemon)
-    Puppet.notice _("Starting Puppet client version %{version}") % { version: Puppet.version }
+    Puppet.notice _("Starting OpenVox client version %{version}") % { version: Puppet.version }
     daemon.start
   end
 

data/lib/puppet/application/apply.rb

@@ -69,7 +69,7 @@ class Puppet::Application::Apply < Puppet::Application
       differences. When combined with scheduling and an automated system for
       pushing manifests, this can be used to implement a serverless site.
 
-      Most users should use 'puppet agent' and 'puppet master' for site-wide
+      Most users should use 'puppet agent' with an OpenVox server for site-wide
       manifests.
 
 
@@ -81,7 +81,7 @@ class Puppet::Application::Apply < Puppet::Application
       as an argument.
 
       See the configuration file documentation at
-      https://puppet.com/docs/puppet/latest/configuration.html for the
+      https://docs.openvoxproject.org/openvox/latest/configuration.html for the
       full list of acceptable parameters. You can generate a commented list of all
       configuration options by running puppet with
       '--genconfig'.
@@ -128,8 +128,8 @@ class Puppet::Application::Apply < Puppet::Application
         format.
 
       * --noop:
-        Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
-        is useful for seeing what changes Puppet will make without actually
+        Use 'noop' mode where OpenVox runs in a no-op or dry-run mode. This
+        is useful for seeing what changes OpenVox will make without actually
         executing the changes.
 
       * --execute:
@@ -143,7 +143,7 @@ class Puppet::Application::Apply < Puppet::Application
         Print extra information.
 
       * --catalog:
-        Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
+        Apply a JSON catalog (such as one generated with 'puppet catalog compile'). You can
         either specify a JSON file or pipe in JSON from standard input.
 
       * --write-catalog-summary
@@ -165,8 +165,8 @@ class Puppet::Application::Apply < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP

data/lib/puppet/application/describe.rb

@@ -185,7 +185,7 @@ class Puppet::Application::Describe < Puppet::Application
 
       SYNOPSIS
       --------
-      Prints help about Puppet resource types, providers, and metaparameters
+      Prints help about resource types, providers, and metaparameters
       installed on an OpenVox node.
 
 
@@ -226,8 +226,8 @@ class Puppet::Application::Describe < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP

data/lib/puppet/application/device.rb

@@ -134,7 +134,7 @@ class Puppet::Application::Device < Puppet::Application
       The optional debug property specifies transport-level debugging,
       and is limited to telnet and ssh transports.
 
-      See https://puppet.com/docs/puppet/latest/config_file_device.html for details.
+      See https://docs.openvoxproject.org/openvox/latest/config_file_device.html for details.
 
 
       OPTIONS

data/lib/puppet/application/doc.rb

@@ -63,7 +63,7 @@ class Puppet::Application::Doc < Puppet::Application
 
       SYNOPSIS
       --------
-      Generates a reference for all Puppet types. Largely meant for internal use. (Deprecated)
+      Generates a reference for all resource types. Largely meant for internal use. (Deprecated)
 
 
       USAGE
@@ -75,7 +75,7 @@ class Puppet::Application::Doc < Puppet::Application
       DESCRIPTION
       -----------
       This deprecated command generates a Markdown document to stdout
-      describing all installed Puppet types or all allowable arguments to
+      describing all installed resource types or all allowable arguments to
       puppet executables. It is largely meant for internal use and is used to
       generate the reference documents which can be posted to a website.
 
@@ -83,9 +83,7 @@ class Puppet::Application::Doc < Puppet::Application
       has been superseded by the "puppet-strings"
       module - see https://github.com/puppetlabs/puppetlabs-strings for more information.
 
-      This command (puppet-doc) will be removed once the
-      puppetlabs internal documentation processing pipeline is completely based
-      on puppet-strings.
+      This command (puppet-doc) will be removed in a future release.
 
       OPTIONS
       -------
@@ -110,8 +108,8 @@ class Puppet::Application::Doc < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP

data/lib/puppet/application/facts.rb

@@ -5,7 +5,7 @@ require_relative '../../puppet/application/indirection_base'
 class Puppet::Application::Facts < Puppet::Application::IndirectionBase
   # Allows `puppet facts` actions to be run against environments that
   # don't exist locally, such as using the `--environment` flag to make a REST
-  # request to a specific environment on a master. There is no way to set this
+  # request to a specific environment on a server. There is no way to set this
   # behavior per-action, so it must be set for the face as a whole.
   environment_mode :not_required
 end

data/lib/puppet/application/filebucket.rb

@@ -72,7 +72,7 @@ class Puppet::Application::Filebucket < Puppet::Application
 
       Note that 'filebucket' defaults to using a network-based filebucket
       available on the server named 'puppet'. To use this, you'll have to be
-      running as a user with valid Puppet certificates. Alternatively, you can
+      running as a user with valid OpenVox certificates. Alternatively, you can
       use your local file bucket by specifying '--local', or by specifying
       '--bucket' with a local path.
 
@@ -99,7 +99,7 @@ class Puppet::Application::Filebucket < Puppet::Application
       argument.
 
       See the configuration file documentation at
-      https://puppet.com/docs/puppet/latest/configuration.html for the
+      https://docs.openvoxproject.org/openvox/latest/configuration.html for the
       full list of acceptable parameters. A commented list of all
       configuration options can also be generated by running puppet with
       '--genconfig'.
@@ -194,7 +194,7 @@ class Puppet::Application::Filebucket < Puppet::Application
           $ puppet filebucket -b /tmp/TestBucket list
           d41d8cd98f00b204e9800998ecf8427e 2015-05-11 09:33:22 /tmp/TestFile2
 
-          ## From a Puppet Server, list files in the server bucketdir
+          ## From an OpenVox Server, list files in the server bucketdir
           $ puppet filebucket -b $(puppet config print bucketdir --section server) list
           d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
           7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
@@ -206,8 +206,8 @@ class Puppet::Application::Filebucket < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP

data/lib/puppet/application/lookup.rb

@@ -133,7 +133,7 @@ class Puppet::Application::Lookup < Puppet::Application
 
       DESCRIPTION
       -----------
-      The lookup command is a CLI for Puppet's 'lookup()' function. It searches your
+      The lookup command is a CLI for OpenVox's 'lookup()' function. It searches your
       Hiera data and returns a value for the requested lookup key, so you can test and
       explore your data. It is a modern replacement for the 'hiera' command.
       Lookup uses the setting for global hiera.yaml from puppet's config,
@@ -143,7 +143,7 @@ class Puppet::Application::Lookup < Puppet::Application
       default, 'puppet lookup' uses facts from the node you run the command on, but
       you can get data for any other node with the '--node <NAME>' option. If
       possible, the lookup command will use the requested node's real stored facts
-      from PuppetDB; if PuppetDB isn't configured or you want to provide arbitrary
+      from OpenVoxDB; if OpenVoxDB isn't configured or you want to provide arbitrary
       fact values, you can pass alternate facts as a JSON or YAML file with '--facts
       <FILE>'.
 
@@ -158,7 +158,7 @@ class Puppet::Application::Lookup < Puppet::Application
       value for the first found key, omitting the rest.
 
       For more details about how Hiera works, see the Hiera documentation:
-      https://puppet.com/docs/puppet/latest/hiera_intro.html
+      https://docs.openvoxproject.org/openvox/latest/hiera_intro.html
 
       OPTIONS
       -------
@@ -175,7 +175,7 @@ class Puppet::Application::Lookup < Puppet::Application
         is run. Since Hiera's purpose is to provide different values for different
         nodes (usually based on their facts), you'll usually want to use some specific
         node's facts to explore your data. If the node where you're running this
-        command is configured to talk to PuppetDB, the command will use the requested
+        command is configured to talk to OpenVoxDB, the command will use the requested
         node's most recent facts. Otherwise, you can override facts with the '--facts'
         option.
 
@@ -185,7 +185,7 @@ class Puppet::Application::Lookup < Puppet::Application
         original value.
 
       * --environment <ENV>
-        Like with most Puppet commands, you can specify an environment on the command
+        Like with most OpenVox commands, you can specify an environment on the command
         line. This is important for lookup because different environments can have
         different Hiera data. This environment will be always be the one used regardless
         of any other factors.
@@ -236,14 +236,14 @@ class Puppet::Application::Lookup < Puppet::Application
 
       EXAMPLE
       -------
-        To look up 'key_name' using the Puppet Server node's facts:
+        To look up 'key_name' using the OpenVox Server node's facts:
         $ puppet lookup key_name
 
-        To look up 'key_name' using the Puppet Server node's arbitrary variables from a manifest, and
+        To look up 'key_name' using the OpenVox Server node's arbitrary variables from a manifest, and
         classify the node if applicable:
         $ puppet lookup key_name --compile
 
-        To look up 'key_name' using the Puppet Server node's facts, overridden by facts given in a file:
+        To look up 'key_name' using the OpenVox Server node's facts, overridden by facts given in a file:
         $ puppet lookup key_name --facts fact_file.yaml
 
         To look up 'key_name' with agent.local's facts:

data/lib/puppet/application/resource.rb

@@ -60,7 +60,7 @@ class Puppet::Application::Resource < Puppet::Application
       -----------
       This command provides simple facilities for converting current system
       state into Puppet code, along with some ability to modify the current
-      state using Puppet's RAL.
+      state using the OpenVox RAL.
 
       By default, you must at least provide a type to list, in which case
       puppet resource will tell you everything it knows about all resources of
@@ -71,7 +71,7 @@ class Puppet::Application::Resource < Puppet::Application
       puppet resource will modify the state of the specified resource.
       Alternately, if given a type, a name, and the '--edit' flag, puppet
       resource will write its output to a file, open that file in an editor,
-      and then apply the saved file as a Puppet transaction.
+      and then apply the saved file as an OpenVox transaction.
 
 
       OPTIONS
@@ -82,7 +82,7 @@ class Puppet::Application::Resource < Puppet::Application
       argument.
 
       See the configuration file documentation at
-      https://puppet.com/docs/puppet/latest/configuration.html for the
+      https://docs.openvoxproject.org/openvox/latest/configuration.html for the
       full list of acceptable parameters. A commented list of all
       configuration options can also be generated by running puppet with
       '--genconfig'.
@@ -137,8 +137,8 @@ class Puppet::Application::Resource < Puppet::Application
 
       COPYRIGHT
       ---------
-      Copyright (c) 2011 Puppet Inc.
-      Copyright (c) 2024 Vox Pupuli
+      Copyright (c) 2011 Puppet Inc.;
+      Copyright (c) 2024 Vox Pupuli.
       Licensed under the Apache 2.0 License
 
     HELP

data/lib/puppet/application/script.rb

@@ -56,7 +56,7 @@ class Puppet::Application::Script < Puppet::Application
       as an argument.
 
       See the configuration file documentation at
-      https://puppet.com/docs/puppet/latest/configuration.html for the
+      https://docs.openvoxproject.org/openvox/latest/configuration.html for the
       full list of acceptable parameters. A commented list of all
       configuration options can also be generated by running puppet with
       '--genconfig'.
@@ -84,8 +84,8 @@ class Puppet::Application::Script < Puppet::Application
         format.
 
       * --noop:
-        Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
-        is useful for seeing what changes Puppet will make without actually
+        Use 'noop' mode where OpenVox runs in a no-op or dry-run mode. This
+        is useful for seeing what changes OpenVox will make without actually
         executing the changes. Applies to tasks only.
 
       * --execute:

data/lib/puppet/application/ssl.rb

@@ -55,8 +55,8 @@ class Puppet::Application::Ssl < Puppet::Application
         Perform all of the steps necessary to request and download a client
         certificate. If autosigning is disabled, then puppet will wait every
         `waitforcert` seconds for its certificate to be signed. To only attempt
-        once and never wait, specify a time of 0. Since `waitforcert` is a
-        Puppet setting, it can be specified as a time interval, such as 30s,
+        once and never wait, specify a time of 0. Since `waitforcert` is an
+        OpenVox setting, it can be specified as a time interval, such as 30s,
         5m, 1h.
 
       * submit_request:
@@ -96,8 +96,8 @@ class Puppet::Application::Ssl < Puppet::Application
 
       COPYRIGHT
         ---------
-        Copyright (c) 2011 Puppet Inc.
-        Copyright (c) 2024 Vox Pupuli
+        Copyright (c) 2011 Puppet Inc.;
+        Copyright (c) 2024 Vox Pupuli.
         Licensed under the Apache 2.0 License
     HELP
   end

data/lib/puppet/application_support.rb

@@ -10,7 +10,7 @@ require_relative '../puppet/indirector'
 module Puppet
   module ApplicationSupport
     # Pushes a Puppet Context configured with a remote environment for an agent
-    # (one that exists at the master end), and a regular environment for other
+    # (one that exists at the server end), and a regular environment for other
     # modes. The configuration is overridden with options from the command line
     # before being set in a pushed Puppet Context.
     #
@@ -44,7 +44,7 @@ module Puppet
     # Reads the routes YAML settings from the file specified by Puppet[:route_file]
     # and resets indirector termini for the current application class if listed.
     #
-    # For instance, PE uses this to set the master facts terminus
+    # For instance, this can be used to set the server facts terminus
     # to 'puppetdb' and its cache terminus to 'yaml'.
     #
     # @param application_name [String] The name of the current application.

data/lib/puppet/configurer.rb

@@ -20,7 +20,7 @@ class Puppet::Configurer
 
   # Provide more helpful strings to the logging that the Agent does
   def self.to_s
-    _("Puppet configuration client")
+    _("OpenVox configuration client")
   end
 
   def self.should_pluginsync?
@@ -253,7 +253,8 @@ class Puppet::Configurer
 
   def prepare_and_retrieve_catalog(cached_catalog, facts, options, query_options)
     # set report host name now that we have the fact
-    options[:report].host = Puppet[:node_name_value]
+    node_name = Puppet[:node_name_value]
+    options[:report].host = node_name
 
     query_options[:transaction_uuid] = @transaction_uuid
     query_options[:job_id] = @job_id
@@ -270,6 +271,11 @@ class Puppet::Configurer
       catalog = retrieve_catalog(facts, query_options)
       Puppet.err _("Could not retrieve catalog; skipping run") unless catalog
     end
+
+    if catalog.name != node_name
+      Puppet.err _("Catalog name '#{catalog.name}' does not match this node's certname '#{node_name}'")
+    end
+
     catalog
   end
 
@@ -318,7 +324,7 @@ class Puppet::Configurer
       if options[:catalog].nil? && do_failover
         server, port = find_functional_server
         if server.nil?
-          detail = _("Could not select a functional puppet server from server_list: '%{server_list}'") % { server_list: Puppet.settings.value(:server_list, Puppet[:environment].to_sym, true) }
+          detail = _("Could not select a functional OpenVox server from server_list: '%{server_list}'") % { server_list: Puppet.settings.value(:server_list, Puppet[:environment].to_sym, true) }
           if Puppet[:usecacheonfailure]
             options[:pluginsync] = false
             @running_failure = true
@@ -332,7 +338,7 @@ class Puppet::Configurer
           end
         else
           # TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          Puppet.debug _("Selected puppet server from the `server_list` setting: %{server}:%{port}") % { server: server, port: port }
+          Puppet.debug _("Selected OpenVox server from the `server_list` setting: %{server}:%{port}") % { server: server, port: port }
           report.server_used = "#{server}:#{port}"
         end
         Puppet.override(server: server, serverport: port) do
@@ -557,7 +563,7 @@ class Puppet::Configurer
       service = session.route_to(:puppet)
       return [service.url.host, service.url.port]
     rescue Puppet::HTTP::ResponseError => e
-      Puppet.debug(_("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
+      Puppet.debug(_("OpenVox server %{host}:%{port} is unavailable: %{code} %{reason}") %
                    { host: e.response.url.host, port: e.response.url.port, code: e.response.code, reason: e.response.reason })
     rescue => detail
       # TRANSLATORS 'server_list' is the name of a setting and should not be translated
@@ -653,10 +659,10 @@ class Puppet::Configurer
     Puppet.log_exception(detail, _("Could not save last run local report: %{detail}") % { detail: detail })
   end
 
-  # Submit updated facts to the Puppet Server
+  # Submit updated facts to the OpenVox Server
   #
   # This method will clear all current fact values, load a fresh set of
-  # fact data, and then submit it to the Puppet Server.
+  # fact data, and then submit it to the OpenVox Server.
   #
   # @return [true] If fact submission succeeds.
   # @return [false] If an exception is raised during fact generation or

data/lib/puppet/confine/variable.rb

@@ -2,8 +2,8 @@
 
 require_relative '../../puppet/confine'
 
-# Require a specific value for a variable, either a Puppet setting
-# or a Facter value.  This class is a bit weird because the name
+# Require a specific value for a variable, either an OpenVox setting
+# or an OpenFact value.  This class is a bit weird because the name
 # is set explicitly by the ConfineCollection class -- from this class,
 # it's not obvious how the name would ever get set.
 class Puppet::Confine::Variable < Puppet::Confine

data/lib/puppet/context.rb

@@ -3,7 +3,7 @@
 require_relative '../puppet/thread_local'
 
 # Puppet::Context is a system for tracking services and contextual information
-# that puppet needs to be able to run. Values are "bound" in a context when it is created
+# that OpenVox needs to be able to run. Values are "bound" in a context when it is created
 # and cannot be changed; however a child context can be created, using
 # {#override}, that provides a different value.
 #

data/lib/puppet/data_binding.rb

@@ -7,7 +7,7 @@ class Puppet::DataBinding
   # Set up indirection, so that data can be looked for in the compiler
   extend Puppet::Indirector
 
-  indirects(:data_binding, :terminus_setting => :data_binding_terminus,
+  indirects(:data_binding, :terminus_class => :hiera,
                            :doc => "Where to find external data bindings.")
 
   class LookupError < Puppet::PreformattedError; end