Merge pull request #426 from david22swan/IAC-1020/main/remocal_of_ina…

…ppropriate_terminology

(IAC-1020) - removal of Inappropriate Terminology

.sync.yml

@@ -47,7 +47,7 @@ Gemfile:
     - gem: simplecov-console
     - gem: github_changelog_generator
       git: https://github.com/skywinder/github-changelog-generator
-      ref: master
+      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
       condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
     ":system_tests":
     - gem: puppet-module-posix-system-r#{minor_version}

Gemfile

@@ -32,7 +32,7 @@ group :development do
   gem "codecov",                                                     require: false
   gem "puppet-resource_api"
   gem "simplecov-console",                                           require: false
-  gem "github_changelog_generator",                                  require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: 'master' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
+  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 :default do
   gem "backport_dig",                                          require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')

README.md

@@ -35,20 +35,20 @@ This module requires a user that can access the device via SSH and that has the
 
 #### Proxy Puppet agent
 
-Since a Puppet agent is not available for the Catalysts (and, seriously, who would want to run an agent on them?) we need a proxy Puppet agent (either a compile master, or another agent) to run Puppet on behalf of the device.
+Since a Puppet agent is not available for the Catalysts (and, seriously, who would want to run an agent on them?) we need a proxy Puppet agent (either a compiler, or another agent) to run Puppet on behalf of the device.
 
 #### Install dependencies
 
 To install dependencies of the Cisco IOS module:
 
-1. Classify or apply the `cisco_ios` class on each master (master of masters, and if present, compile masters and replica master) that serves catalogs for this module.
+1. Classify or apply the `cisco_ios` class on each server (server of servers, and if present, compilers and replica servers) that serves catalogs for this module.
 1. Classify or apply the `cisco_ios` class on each proxy Puppet agent that proxies for Cisco IOS devices.
 
-Run puppet agent -t on the master(s) before using the module on the agent(s).
+Run puppet agent -t on the server(s) before using the module on the agent(s).
 
 ### Beginning with cisco_ios with Bolt
 
-Check out the [Hands-on Lab](https://github.com/puppetlabs/cisco_ios/tree/master/docs/README.md) for getting started with bolt.
+Check out the [Hands-on Lab](https://github.com/puppetlabs/cisco_ios/tree/main/docs/README.md) for getting started with bolt.
 
 ### Beginning with cisco_ios with Puppet
 
@@ -62,7 +62,7 @@ type cisco_ios
 url file:////etc/puppetlabs/puppet/devices/cisco.example.com.conf`
 ```
 
-The credentials file must contain a hash in [HOCON format](https://github.com/lightbend/config/blob/master/HOCON.md) that matches the schema defined in [lib/puppet/transport/schema/cisco_ios.rb](lib/puppet/transport/schema/cisco_ios.rb) for example:
+The credentials file must contain a hash in [HOCON format](https://github.com/lightbend/config/blob/main/HOCON.md) that matches the schema defined in [lib/puppet/transport/schema/cisco_ios.rb](lib/puppet/transport/schema/cisco_ios.rb) for example:
 
 ```
 host:            "10.0.0.246"
@@ -123,7 +123,7 @@ Or:
 Exiting; no certificate found and waitforcert is disabled
 ```
 
-On the master, execute the following to sign the certificate for the device:
+On the server, execute the following to sign the certificate for the device:
 
 * Puppet 6 or later
 
@@ -211,7 +211,7 @@ The `--modulepath` param can be retrieved by typing `puppet config print modulep
 ### Type
 
 Add new types to the type directory.
-We use the [Resource API format](https://github.com/puppetlabs/puppet-resource_api/blob/master/README.md)
+We use the [Resource API format](https://github.com/puppetlabs/puppet-resource_api/blob/main/README.md)
 Use the bundled ios_config example for guidance. Here is a simple example:
 
 ```Ruby

REFERENCE.md

@@ -9,7 +9,7 @@
 * [`cisco_ios::install`](#cisco_iosinstall): This class installs dependencies of this module
 into the puppet agent, and/or the puppetserver service.
 * [`cisco_ios::install::agent`](#cisco_iosinstallagent): This class install dependencies of this module into puppet agent
-* [`cisco_ios::install::master`](#cisco_iosinstallmaster): This class installs dependencies of this module into puppetserver,
+* [`cisco_ios::install::server`](#cisco_iosinstallserver): This class installs dependencies of this module into puppetserver,
 and restarts the puppetserver service to activate.
 * [`cisco_ios::proxy`](#cisco_iosproxy): This class install dependencies of this module into puppet agent
 * [`cisco_ios::server`](#cisco_iosserver): This class installs dependencies of this module into puppetserver,
@@ -84,7 +84,7 @@ This class install dependencies of this module into puppet agent
 include cisco_ios::install::agent
 ```
 
-### cisco_ios::install::master
+### cisco_ios::install::server
 
 This class installs dependencies of this module into puppetserver,
 and restarts the puppetserver service to activate.
@@ -94,7 +94,7 @@ and restarts the puppetserver service to activate.
 ##### Declaring the class
 
 ```puppet
-include cisco_ios::install::master
+include cisco_ios::install::server
 ```
 
 ### cisco_ios::proxy
@@ -116,7 +116,7 @@ include cisco_ios::proxy
 This class installs dependencies of this module into puppetserver,
 and restarts the puppetserver service to activate.
 
-* **Note** Deprecated, use cisco_ios::install::master
+* **Note** Deprecated, use cisco_ios::install::server
 
 #### Examples
 

docs/README.md

@@ -1,6 +1,6 @@
 # Cisco IOS Hands-on-lab
 
-This is a lab which explains how to use this module with [Bolt](https://puppet.com/products/bolt). It is similar to the [lab](https://github.com/puppetlabs/puppetlabs-panos/tree/master/docs/01-using-with-bolt) for how to use the module with Palo Alto.
+This is a lab which explains how to use this module with [Bolt](https://puppet.com/products/bolt). It is similar to the [lab](https://github.com/puppetlabs/puppetlabs-panos/tree/main/docs/01-using-with-bolt) for how to use the module with Palo Alto.
 
 This labs is intended for a new user and covers off only basic capabilities. Feedback and suggestions for improvement are welcome.
 

lib/puppet/transport/schema/cisco_ios.rb

@@ -50,7 +50,7 @@
 The SSH host key, and hence its identity, will not be verified during the first connection
 attempt. The host key will be added to this file and verified on subsequent accesses.
 
-To force using specific host keys, instead of trusting the initial connection handshake, deploy a `known_hosts` file to your puppet master, or proxy agent, with verified fingerprints and specify that file here.
+To force using specific host keys, instead of trusting the initial connection handshake, deploy a `known_hosts` file to your puppet server, or proxy agent, with verified fingerprints and specify that file here.
 (Default is based on the device's cache directory. For example: `/opt/puppetlabs/puppet/cache/devices/<CERTNAME>/ssl/known_hosts`)
 DESC
     },

manifests/install.pp

@@ -8,6 +8,6 @@
   include cisco_ios::install::agent
 
   if $facts['puppetserver_installed'] {
-    include cisco_ios::install::master
+    include cisco_ios::install::server
   }
 }

manifests/install/master.pp → manifests/install/server.pp

@@ -2,7 +2,7 @@
 #          and restarts the puppetserver service to activate.
 #
 # @example Declaring the class
-#   include cisco_ios::install::master
-class cisco_ios::install::master {
-  include resource_api::install::master
+#   include cisco_ios::install::server
+class cisco_ios::install::server {
+  include resource_api::install::server
 }

manifests/server.pp

@@ -4,7 +4,7 @@
 # @example Declaring the class
 #   include cisco_ios::server
 #
-# @note Deprecated, use cisco_ios::install::master
+# @note Deprecated, use cisco_ios::install::server
 class cisco_ios::server {
   include resource_api::server
 }

spec/acceptance/nodesets/default.yml

@@ -1,8 +1,8 @@
 HOSTS:
-  mastermachine:
+  servermachine:
     roles:
       - default
-      - master
+      - server
       - dashboard
       - database
     platform: ubuntu-14.04-amd64