diff --git a/README.md b/README.md index 97f3158..5ce8e73 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ This module is also designed to work with External Node Classifiers (ENC), for i ## 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). * open firewall ports depending on fqdn choices * start services as required diff --git a/manifests/main/files.pp b/manifests/main/files.pp index c113497..d2f7660 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -33,7 +33,6 @@ class puppet_cd::main::files ( } if $pt_use_puppetdb == true { - file { $pt_puppetdb_conf_file: ensure => filet, path => $pt_puppetdb_conf_file, diff --git a/manifests/main/install.pp b/manifests/main/install.pp index 6a98a6c..900d6c7 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -6,8 +6,6 @@ class puppet_cd::main::install ( ) inherits puppet_cd::params { - require puppet_cd::main::yumrepo - package { $pt_agent_pkg: ensure => $pt_pkg_ensure, } diff --git a/manifests/main/yumrepo.pp b/manifests/main/yumrepo.pp deleted file mode 100644 index 1206ca1..0000000 --- a/manifests/main/yumrepo.pp +++ /dev/null @@ -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, - } -} diff --git a/manifests/params.pp b/manifests/params.pp index 9c1ae6c..e4861a3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,6 @@ # @param [string] pt_pm_fqdn the fqdn for the puppetmaster and master # 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_package_url the url for fetching the repo rpm # @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_server_pkg the server packages to install @@ -27,7 +26,7 @@ # @param [boolean] pt_use_puppetdb whether to use puppetdb on host # @param [string] pt_environment the environment # @param [boolean] pt_basemodulepath the base module path -# @param +# @param [string] pt_logdir the log directory ############################################################################### class puppet_cd::params ( @@ -36,7 +35,6 @@ class puppet_cd::params ( String $pt_db_fqdn = 'puppetdb.example.net', # installation - String $pt_package_url = 'https://yum.puppet.com/puppet8-release-el-9.noarch.rpm', String $pt_pkg_ensure = 'present', String $pt_agent_pkg = 'puppet-agent', String $pt_server_pkg = 'puppetserver', diff --git a/templates/agent.conf.erb b/templates/agent.conf.erb deleted file mode 100644 index 28503f8..0000000 --- a/templates/agent.conf.erb +++ /dev/null @@ -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 %> \ No newline at end of file