Skip to content

Commit

Permalink
params.pp → moduledata
Browse files Browse the repository at this point in the history
  • Loading branch information
faxm0dem committed Apr 5, 2018
1 parent 183f765 commit baa88d9
Show file tree
Hide file tree
Showing 13 changed files with 98 additions and 145 deletions.
7 changes: 7 additions & 0 deletions data/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
conserver::service_process: conserver
conserver::masters:
- localhost
conserver::manage_init_defaults: true
conserver::check_config_syntax: true
conserver::use_hiera: true
1 change: 1 addition & 0 deletions data/osfamily/Amazon
6 changes: 6 additions & 0 deletions data/osfamily/Debian/12.04/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
conserver::server_init_config_file: /etc/conserver/server.local
conserver::server_init_config_tpl: conserver/server/init_config_file.erb
conserver::server_init_config_hash: {}
conserver::server_user: conservr
conserver::status_cmd: true
6 changes: 6 additions & 0 deletions data/osfamily/Debian/7/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
conserver::server_init_config_file: /etc/conserver/server.local
conserver::server_init_config_tpl: conserver/server/init_config_file.erb
conserver::server_init_config_hash: {}
conserver::server_user: conservr
conserver::status_cmd: true
1 change: 1 addition & 0 deletions data/osfamily/Debian/8
15 changes: 15 additions & 0 deletions data/osfamily/Debian/9/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
conserver::server_init_config_hash:
Unit:
Description: Conserver Serial-Port Console Daemon
After: network.target
Service:
Type: forking
ExecStart: /usr/sbin/conserver -d
User: root
Install:
WantedBy: multi-user.target
conserver::server_user: root
conserver::status_cmd: true
6 changes: 6 additions & 0 deletions data/osfamily/Debian/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
conserver::server_package_name: conserver-server
conserver::client_package_name: conserver-client
conserver::service_name: conserver-server
conserver::confdir: /etc/conserver'
conserver::restart_cmd: /usr/sbin/service conserver-server restart
4 changes: 4 additions & 0 deletions data/osfamily/RedHat/6/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
conserver::server_init_config_file: /etc/default/conserver
conserver::server_init_config_tpl: conserver/server/init_config_file.erb
conserver::server_init_config_hash: {}
13 changes: 13 additions & 0 deletions data/osfamily/RedHat/7/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
conserver::server_init_config_file: /usr/lib/systemd/system/conserver.service
conserver::server_init_config_tpl: conserver/server/init_config_file_systemd.erb
conserver::server_init_config_hash:
Unit:
Description: Conserver Serial-Port Console Daemon
After: network.target
Service:
Type: forking
ExecStart: /usr/sbin/conserver -d
User: root
Install:
WantedBy: multi-user.target
8 changes: 8 additions & 0 deletions data/osfamily/RedHat/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
conserver::server_package_name: conserver
conserver::client_package_name: conserver-client
conserver::service_name: conserver
conserver::confdir: /etc
conserver::restart_cmd: /sbin/service conserver restart
conserver::status_cmd: true
conserver::server_user: root
12 changes: 12 additions & 0 deletions hiera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
version: 5
defaults:
datadir: data
data_hash: yaml_data
hierarchy:
- name: osfamily-majrelease
path: "osfamily/%{facts.os.family}/%{facts.os.release.major}/default.yaml"
- name: osfamily
path: "osfamily/%{facts.os.family}/default.yaml"
- name: default
path: default.yaml
59 changes: 19 additions & 40 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,31 @@
# Contributor(s) : ccin2p3
#

# == Class: conserver
#
# Full description of class conserver here.
#
# === Parameters
#
# [*sample_parameter*]
# Explanation of what this parameter affects and what it defaults to.
#
class conserver (
$server_package_name = $::conserver::params::server_package_name,
$client_package_name = $::conserver::params::client_package_name,
$service_name = $::conserver::params::service_name,
$service_process = $::conserver::params::service_process,
$confdir = $::conserver::params::confdir,
$masters = $::conserver::params::masters,
$reload_cmd = $::conserver::params::reload_cmd,
$restart_cmd = $::conserver::params::restart_cmd,
$status_cmd = $::conserver::params::status_cmd,
$enable_client = true,
$enable_server = true,
$manage_package = true,
$manage_init_defaults = true,
$server_init_config_file = $::conserver::params::server_init_config_file,
$server_init_config_hash = {},
$server_user = $::conserver::params::server_user,
$use_hiera = true,
$check_config_syntax = true
) inherits conserver::params {
Boolean $check_config_syntax,
String[1] $client_package_name,
String[1] $confdir,
Boolean $enable_client,
Boolean $enable_server,
Boolean $manage_init_defaults,
Boolean $manage_package,
Array[String[1]] $masters,
String[1] $reload_cmd,
String[1] $restart_cmd,
String[1] $server_init_config_file,
Hash $server_init_config_hash,
String[1] $server_package_name,
String[1] $server_user,
String[1] $service_name,
String[1] $service_process,
String[1] $status_cmd,
Boolean $use_hiera,
) {

# validate parameters here
validate_string($server_package_name)
validate_string($client_package_name)
validate_string($service_name)
validate_absolute_path($confdir)
validate_array($masters)
validate_string($reload_cmd)
validate_string($restart_cmd)
validate_bool($enable_client)
validate_bool($enable_server)
validate_bool($manage_init_defaults)
validate_bool($manage_package)
validate_bool($check_config_syntax)
validate_absolute_path($server_init_config_file)
validate_hash($server_init_config_hash)
validate_string($server_user)

if $enable_client {
include ::conserver::client
Expand Down
105 changes: 0 additions & 105 deletions manifests/params.pp

This file was deleted.

0 comments on commit baa88d9

Please sign in to comment.