Skip to content

Commit

Permalink
Make puppet::server install from puppet topclass
Browse files Browse the repository at this point in the history
  • Loading branch information
@GregSutcliffe
GregSutcliffe committed Aug 14, 2013
1 parent 6006250 commit 3c15811
Show file tree
Hide file tree
Showing 14 changed files with 325 additions and 312 deletions.
57 changes: 27 additions & 30 deletions README.md
View file
Expand Up @@ -2,10 +2,7 @@

Installs Puppet agent:

* Optional class to run Puppet from Cron - puppet::cron
* Optional Class to run Puppet as a daemon - puppet::daemon

Optional support for install Puppet server (puppet::server)
Optional support for installation of a Puppetmaster (using server => true)

* Configurable support for static or git-backed dynamic environments (requires puppet-git module)
* Storeconfig options (off, ActiveRecord or PuppetDB)
Expand All @@ -29,59 +26,59 @@ Only really tested on RedHat and Debian. Patches welcome for other OSes :)

This is a parameterized class, but the defaults should get you going:

Standalone agent:
Standalone agent with defaults:

echo include puppet | puppet --modulepath /path_to/extracted_tarball

Agent and cron (or daemon):

echo include puppet, puppet::cron | puppet --modulepath /path_to/extracted_tarball

Agent and server:

echo include puppet, puppet::server | puppet --modulepath /path_to/extracted_tarball

# Customization

As a parameterized class, all the configurable options can be overridden from your
wrapper classes or even your ENC (if it supports param classes). For example:

# Agent and cron (or daemon):
class { '::puppet': runmode => 'cron' }

# Agent and puppetmaster:
class { '::puppet': server => true }

# You want to use git?
class { '::puppet::server': git_repo => true }
class { '::puppet':
server => true
server_git_repo => true
}

# You need need your own template for puppet.conf?
class { '::puppet::server':
agent_template => 'puppetagent/puppet.conf.core.erb',
master_template => 'puppetserver/puppet.conf.master.erb',
}
class { '::puppet':
agent_template => 'puppetagent/puppet.conf.core.erb',
server => true,
server_template => 'puppetserver/puppet.conf.master.erb',
}

# Maybe you're using gitolite, new hooks, and a different port?
class { '::puppet::server':
port => 8141,
git_repo => true,
git_repo_path => '/var/lib/gitolite/repositories/puppet.git',
post_hook_name => 'post-receive.puppet',
post_hook_content => 'puppetserver/post-hook.puppet',
class { '::puppet':
server => true
server_port => 8141,
server_git_repo => true,
server_git_repo_path => '/var/lib/gitolite/repositories/puppet.git',
server_post_hook_name => 'post-receive.puppet',
server_post_hook_content => 'puppetserver/post-hook.puppet',
}

# Perhaps you want to install without foreman?
class { '::puppet::server':
reports => 'store',
external_nodes => false,
class { '::puppet':
server => true,
server_reports => 'store',
server_external_nodes => false,
}

Look in _init.pp_ for what can be configured this way, see Contributing if anything
doesn't work.

To use this in standalone mode, edit a file (e.g. install.pp), put in a class resource,
as per the examples above, and the execute _puppet apply_:
as per the examples above, and the execute _puppet apply_ e.g:

cat > install.pp <<EOF
class { '::puppet': }
class { '::puppet::server': git_repo => true }
class { '::puppet': server => true }
EOF
puppet apply install.pp --modulepath /path_to/extracted_tarball

Expand Down
212 changes: 176 additions & 36 deletions manifests/init.pp
View file
Expand Up @@ -4,80 +4,220 @@
#
# === Parameters:
#
# $dir:: Override the puppet directory.
# Defaults to '/etc/puppet'.
# $version:: Specify a specific version of a package to install.
# The version should be the exact match for your distro.
# You can also use certain values like 'latest'.
#
# $ca_server:: Use a different ca server. Should be either a string
# with the location of the ca_server or 'false'.
# Defaults to 'false;.
# $user:: Override the name of the puppet user.
#
# $group:: Override the name of the puppet group.
#
# $dir:: Override the puppet directory.
#
# $port:: Override the port of the master we connect to.
# Defaults to '8140'.
# type:integer
#
# $listen:: Should the puppet agent listen for connections.
# Defaults to 'false'.
# type:boolean
#
# $pluginsync:: Enable pluginsync.
# Defaults to 'true'.
# type:boolean
#
# $splay:: Switch to enable a random amount of time to sleep before
# each run.
# Defaults to 'false'.
# type:boolean
#
# $runinterval:: Set up the interval to run the puppet agent.
# Defaults to '1800' (seconds).
# $runinterval:: Set up the interval (in seconds) to run the puppet agent.
# type:integer
#
# $runmode:: Select the mode to setup the puppet agent. Can be either
# 'cron' or 'service'.
# Defaults to 'service'.
#
# $agent_noop:: Run the agent in noop mode.
# Defaults to 'false'.
# type:boolean
#
# $show_diff:: Show and report changed files with diff output
#
# $ca_server:: Use a different ca server. Should be either a string
# with the location of the ca_server or 'false'.
#
# $agent_template:: Use a custom template for the agent puppet configuration.
#
# $auth_template:: Use a custom template for the auth configuration.
#
# $nsauth_template:: Use a custom template for the nsauth configuration.
#
# $version:: Specify a specific version of a package to install.
# The version should be the exact match for your distro.
# You can also use certain values like 'latest'.
# Defaults to 'present'.
# $client_package:: Install a custom package to provide the puppet client
#
# $show_diff:: Show and report changed files with diff output
# Defaults to 'false'.
# == puppet::server parameters
#
# $server:: Should a puppet master be installed as well as the client
# type:boolean
#
# $server_user:: Name of the puppetmaster user.
#
# $server_group:: Name of the puppetmaster group.
#
# $server_dir:: Puppet configuration directory
#
# $server_port:: Puppet master port
# type:integer
#
# $server_vardir:: Puppet data directory.
#
# $server_ca:: Provide puppet CA
# type:boolean
#
# $server_reports List of report types to include on the puppetmaster
#
# $server_passenger:: If set to true, we will configure apache with
# passenger. If set to false, we will enable the
# default puppetmaster service unless
# service_fallback is set to false. See 'Advanced
# server parameters' for more information.
# type:boolean
#
# $server_external_nodes:: External nodes classifier executable
#
# $server_template:: Which template should be used for master configuration
#
# $server_git_repo:: Use git repository as a source of modules
# type:boolean
#
# $server_environments:: Environments to setup (creates directories)
# type:array
#
# $server_envs_dir:: Directory that holds puppet environments
#
# $server_manifest_path:: Path to puppet site.pp manifest
#
# $server_common_modules_path:: Common modules paths
# type:array
#
# $server_git_repo_path:: Git repository path
#
# $server_post_hook_content:: Which template to use for git post hook
#
# $server_post_hook_name:: Name of a git hook
#
# $server_storeconfigs_backend:: Do you use storeconfigs? (note: not required)
# false if you don't, "active_record" for 2.X
# style db, "puppetdb" for puppetdb
#
# $server_app_root:: Directory where the application lives
#
# $server_ssl_dir:: SSL directory
#
# $server_package:: Custom package name for puppet master
#
# === Advanced server parameters:
#
# $server_httpd_service:: Apache/httpd service name to notify on configuration
# changes. Defaults to 'httpd' based on the default
# apache module included with foreman-installer.
#
# $server_service_fallback:: If passenger is not used, do we want to fallback
# to using the puppetmaster service? Set to false
# if you disabled passenger and you do NOT want to
# use the puppetmaster service. Defaults to true.
# type:boolean
#
# $server_passenger_max_pool:: The PassengerMaxPoolSize parameter. If your host is
# low on memory, it may be a good thing to lower
# this. Defaults to 12.
# type:integer
#
# $server_config_version:: How to determine the configuration version. When
# using git_repo, by default a git describe approach
# will be installed.
#
# $foreman_url:: Foreman URL
#
# $facts:: Should foreman receive facts from puppet
# type:boolean
#
# $puppet_basedir:: Where is the puppet code base located
#
# $puppet_home:: Puppet var directory
#
# === Usage:
#
# * Simple usage:
#
# include puppet
#
# * Installing a puppetmaster
#
# class {'puppet':
# server => true,
# }
#
# * Advanced usage:
#
# class {'puppet':
# agent_noop => true,
# version => '2.7.20-1',
# }
#
#
class puppet (
$dir = $puppet::params::dir,
$ca_server = $puppet::params::ca_server,
$port = $puppet::params::port,
$listen = $puppet::params::listen,
$pluginsync = $puppet::params::pluginsync,
$splay = $puppet::params::splay,
$runinterval = $puppet::params::runinterval,
$runmode = $puppet::params::runmode,
$agent_noop = $puppet::params::agent_noop,
$agent_template = $puppet::params::agent_template,
$auth_template = $puppet::params::auth_template,
$nsauth_template = $puppet::params::nsauth_template,
$version = $puppet::params::version,
$show_diff = $puppet::params::show_diff
$version = $puppet::params::version,
$user = $puppet::params::user,
$group = $puppet::params::group,
$dir = $puppet::params::dir,
$port = $puppet::params::port,
$listen = $puppet::params::listen,
$pluginsync = $puppet::params::pluginsync,
$splay = $puppet::params::splay,
$runinterval = $puppet::params::runinterval,
$runmode = $puppet::params::runmode,
$agent_noop = $puppet::params::agent_noop,
$show_diff = $puppet::params::show_diff,
$ca_server = $puppet::params::ca_server,
$agent_template = $puppet::params::agent_template,
$auth_template = $puppet::params::auth_template,
$nsauth_template = $puppet::params::nsauth_template,
$client_package = $puppet::params::client_package,
$server = $puppet::params::server,
$server_user = $puppet::params::user,
$server_group = $puppet::params::group,
$server_dir = $puppet::params::dir,
$server_port = $puppet::params::port,
$server_vardir = $puppet::params::server_vardir,
$server_ca = $puppet::params::server_ca,
$server_reports = $puppet::params::server_reports,
$server_passenger = $puppet::params::server_passenger,
$server_service_fallback = $puppet::params::server_service_fallback,
$server_passenger_max_pool = $puppet::params::server_passenger_max_pool,
$server_httpd_service = $puppet::params::server_httpd_service,
$server_external_nodes = $puppet::params::server_external_nodes,
$server_template = $puppet::params::server_template,
$server_config_version = $puppet::params::server_config_version,
$server_git_repo = $puppet::params::server_git_repo,
$server_environments = $puppet::params::server_environments,
$server_envs_dir = $puppet::params::server_envs_dir,
$server_manifest_path = $puppet::params::server_manifest_path,
$server_common_modules_path = $puppet::params::server_common_modules_path,
$server_git_repo_path = $puppet::params::server_git_repo_path,
$server_post_hook_content = $puppet::params::server_post_hook_content,
$server_post_hook_name = $puppet::params::server_post_hook_name,
$server_storeconfigs_backend = $puppet::params::server_storeconfigs_backend,
$server_app_root = $puppet::params::server_app_root,
$server_ssl_dir = $puppet::params::server_ssl_dir,
$server_package = $puppet::params::server_package,
$server_foreman_url = $foreman::params::foreman_url,
$server_facts = $foreman::params::facts,
$server_puppet_home = $foreman::params::puppet_home,
$server_puppet_basedir = $foreman::params::puppet_basedir
) inherits puppet::params {
class { 'puppet::install': }~>
class { 'puppet::config': }

class { 'puppet::install': } ~>
class { 'puppet::config': } ->
Class['puppet']

if $server == true {
class { 'puppet::server':
require => Class['puppet::config'],
}
}

}

0 comments on commit 3c15811

Please sign in to comment.