3
0

remove yumrepo, since puppet is already installed in any case

This commit is contained in:
Arne Teuke
2025-02-27 18:45:49 +01:00
parent a75ddf964c
commit b9c3265cd2
6 changed files with 1 additions and 37 deletions

View File

@@ -16,7 +16,6 @@ This module is also designed to work with External Node Classifiers (ENC), for i
## Features ## Features
* install repo rpm (this will create the repo definitions)
* install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent). * install packages depending on whether the host fqdn equals either master fqdn, db fqdn or none (agent).
* open firewall ports depending on fqdn choices * open firewall ports depending on fqdn choices
* start services as required * start services as required

View File

@@ -33,7 +33,6 @@ class puppet_cd::main::files (
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
ensure => filet, ensure => filet,
path => $pt_puppetdb_conf_file, path => $pt_puppetdb_conf_file,

View File

@@ -6,8 +6,6 @@
class puppet_cd::main::install ( class puppet_cd::main::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
require puppet_cd::main::yumrepo
package { $pt_agent_pkg: package { $pt_agent_pkg:
ensure => $pt_pkg_ensure, ensure => $pt_pkg_ensure,
} }

View File

@@ -1,13 +0,0 @@
## puppet_cd::main::yumrepo.pp
# Module name: puppet_cd
# Author: Arne Teuke (arne_teuke@confdroid)
# @summary Class manages yum repos for the puppet_cd module.
###############################################################################
class puppet_cd::main::yumrepo (
) inherits puppet_cd::params {
# install repo rpm, which will install all the yum repos
package { $pt_package_url:
ensure => $pt_pkg_ensure,
}
}

View File

@@ -6,7 +6,6 @@
# @param [string] pt_pm_fqdn the fqdn for the puppetmaster and master # @param [string] pt_pm_fqdn the fqdn for the puppetmaster and master
# settings are applied. any other fqdn # will be considered a puppet agent. # settings are applied. any other fqdn # will be considered a puppet agent.
# @param [string] pt_db_fqdn the fqdn for the puppetdb host. # @param [string] pt_db_fqdn the fqdn for the puppetdb host.
# @param [string] pt_package_url the url for fetching the repo rpm
# @param [string] pt_pkg_ensure valid: "present", "latest", "v1.2.3" # @param [string] pt_pkg_ensure valid: "present", "latest", "v1.2.3"
# @param [string] pt_agent_pkg the packages for agents to install # @param [string] pt_agent_pkg the packages for agents to install
# @param [string] pt_server_pkg the server packages to install # @param [string] pt_server_pkg the server packages to install
@@ -27,7 +26,7 @@
# @param [boolean] pt_use_puppetdb whether to use puppetdb on host # @param [boolean] pt_use_puppetdb whether to use puppetdb on host
# @param [string] pt_environment the environment # @param [string] pt_environment the environment
# @param [boolean] pt_basemodulepath the base module path # @param [boolean] pt_basemodulepath the base module path
# @param # @param [string] pt_logdir the log directory
############################################################################### ###############################################################################
class puppet_cd::params ( class puppet_cd::params (
@@ -36,7 +35,6 @@ class puppet_cd::params (
String $pt_db_fqdn = 'puppetdb.example.net', String $pt_db_fqdn = 'puppetdb.example.net',
# installation # installation
String $pt_package_url = 'https://yum.puppet.com/puppet8-release-el-9.noarch.rpm',
String $pt_pkg_ensure = 'present', String $pt_pkg_ensure = 'present',
String $pt_agent_pkg = 'puppet-agent', String $pt_agent_pkg = 'puppet-agent',
String $pt_server_pkg = 'puppetserver', String $pt_server_pkg = 'puppetserver',

View File

@@ -1,17 +0,0 @@
###############################################################################
########## puppet.conf generated by puppet ###########
###############################################################################
[agent]
server = <%= @pt_pm_fqdn %>
classfile = $statedir/classes.txt
default_schedules = <%= @pt_default_schedules %>
environment = <%= @pt_environment %>
masterport = <%= @pt_masterport %>
noop = <%= @pt_noop %>
pluginsync = <%= @pt_pluginsync %>
report = <%= @pt_report %>
runinterval = <%= @pt_runinterval %>
splay = <%= @pt_splay %>
splaylimit = <%= @pt_splaylimit %>
usecacheonfailure = <%= @pt_usecacheonfailure %>