Skip to content

Commit

Permalink
move static data to init.pp
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastelfreak
bastelfreak committed Jul 29, 2023
1 parent 9a39c41 commit 42babe4
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 47 deletions.
36 changes: 18 additions & 18 deletions REFERENCE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ The following parameters are available in the `r10k` class:

##### <a name="-r10k--cachedir"></a>`cachedir`

Data type: `Any`
Data type: `Stdlib::Absolutepath`

Path to a directory to be used by r10k for caching data

Default value: `$r10k::params::r10k_cache_dir`
Default value: `"${facts['puppet_vardir']}/r10k"`

##### <a name="-r10k--sources"></a>`sources`

Data type: `Optional[Hash]`

Hash containing data sources to be used by r10k to create dynamic Puppet environments

Default value: `$r10k::params::sources`
Default value: `undef`

##### <a name="-r10k--postrun"></a>`postrun`

Expand All @@ -109,39 +109,39 @@ Data type: `Boolean`

determine if a symlink to the r10k config file is to be managed

Default value: `$r10k::params::manage_configfile_symlink`
Default value: `false`

##### <a name="-r10k--configfile_symlink"></a>`configfile_symlink`

Data type: `Stdlib::Absolutepath`

Location of symlink that points to configfile

Default value: `$r10k::params::configfile_symlink`
Default value: `'/etc/r10k.yaml'`

##### <a name="-r10k--forge_settings"></a>`forge_settings`

Data type: `Optional[Hash]`

Hash containing settings for downloading modules from the Puppet Forge

Default value: `$r10k::params::forge_settings`
Default value: `undef`

##### <a name="-r10k--proxy"></a>`proxy`

Data type: `Optional[String[1]]`

String containing proxy setting for r10k.yaml

Default value: `$r10k::params::proxy`
Default value: `undef`

##### <a name="-r10k--pool_size"></a>`pool_size`

Data type: `Optional[Integer[1]]`
Data type: `Integer[1]`

Integer defining how many threads should be spawn while updating modules

Default value: `$r10k::params::pool_size`
Default value: `$facts['processors']['count']`

##### <a name="-r10k--remote"></a>`remote`

Expand All @@ -153,11 +153,11 @@ Default value: `$r10k::params::remote`

##### <a name="-r10k--configfile"></a>`configfile`

Data type: `Any`
Data type: `Stdlib::Absolutepath`



Default value: `$r10k::params::r10k_config_file`
Default value: `'/etc/puppetlabs/r10k/r10k.yaml'`

##### <a name="-r10k--version"></a>`version`

Expand Down Expand Up @@ -225,19 +225,19 @@ Default value: `$r10k::params::provider`

##### <a name="-r10k--gentoo_keywords"></a>`gentoo_keywords`

Data type: `Any`
Data type: `String`



Default value: `$r10k::params::gentoo_keywords`
Default value: `''`

##### <a name="-r10k--install_options"></a>`install_options`

Data type: `Any`
Data type: `Variant[Array,String]`



Default value: `$r10k::params::install_options`
Default value: `[]`

##### <a name="-r10k--mcollective"></a>`mcollective`

Expand All @@ -253,15 +253,15 @@ Data type: `Optional[Hash]`



Default value: `$r10k::params::git_settings`
Default value: `undef`

##### <a name="-r10k--deploy_settings"></a>`deploy_settings`

Data type: `Hash`



Default value: `$r10k::params::deploy_settings`
Default value: `{ 'generate_types' => true, 'exclude_spec' => true, }`

##### <a name="-r10k--root_user"></a>`root_user`

Expand All @@ -277,7 +277,7 @@ Data type: `Optional[String[1]]`



Default value: `$r10k::params::gem_source`
Default value: `undef`

##### <a name="-r10k--root_group"></a>`root_group`

Expand Down
26 changes: 13 additions & 13 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# @param pool_size Integer defining how many threads should be spawn while updating modules
class r10k (
$remote = $r10k::params::remote,
Optional[Hash] $sources = $r10k::params::sources,
$cachedir = $r10k::params::r10k_cache_dir,
$configfile = $r10k::params::r10k_config_file,
Optional[Hash] $sources = undef,
Stdlib::Absolutepath $cachedir = "${facts['puppet_vardir']}/r10k",
Stdlib::Absolutepath $configfile = '/etc/puppetlabs/r10k/r10k.yaml',
$version = $r10k::params::version,
$puppet_master = $r10k::params::puppet_master,
$modulepath = $r10k::params::modulepath,
Expand All @@ -21,18 +21,18 @@
Stdlib::Absolutepath $r10k_basedir = $r10k::params::r10k_basedir,
$package_name = $r10k::params::package_name,
$provider = $r10k::params::provider,
$gentoo_keywords = $r10k::params::gentoo_keywords,
$install_options = $r10k::params::install_options,
String $gentoo_keywords = '', # lint:ignore:params_empty_string_assignment
Variant[Array,String] $install_options = [],
$mcollective = $r10k::params::mcollective,
Boolean $manage_configfile_symlink = $r10k::params::manage_configfile_symlink,
Stdlib::Absolutepath $configfile_symlink = $r10k::params::configfile_symlink,
Optional[Hash] $git_settings = $r10k::params::git_settings,
Optional[Hash] $forge_settings = $r10k::params::forge_settings,
Hash $deploy_settings = $r10k::params::deploy_settings,
Boolean $manage_configfile_symlink = false,
Stdlib::Absolutepath $configfile_symlink = '/etc/r10k.yaml',
Optional[Hash] $git_settings = undef,
Optional[Hash] $forge_settings = undef,
Hash $deploy_settings = { 'generate_types' => true, 'exclude_spec' => true, },
$root_user = $r10k::params::root_user,
Optional[String[1]] $proxy = $r10k::params::proxy,
Optional[Integer[1]] $pool_size = $r10k::params::pool_size,
Optional[String[1]] $gem_source = $r10k::params::gem_source,
Optional[String[1]] $proxy = undef,
Integer[1] $pool_size = $facts['processors']['count'],
Optional[String[1]] $gem_source = undef,
$root_group = $r10k::params::root_group,
Optional[Array[String[1]]] $postrun = undef,
Boolean $include_prerun_command = false,
Expand Down
17 changes: 1 addition & 16 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,21 @@
default => 'puppet_gem',
}

$install_options = []
$sources = undef
$puppet_master = true
$proxy = undef
$pool_size = $facts['processors']['count']
$gem_source = undef

if 'puppet_environment' in $facts {
$r10k_basedir = $facts['puppet_environmentpath']
} else {
$r10k_basedir = '/etc/puppetlabs/code/environments'
}
$r10k_cache_dir = "${facts['puppet_vardir']}/r10k"
$r10k_config_file = '/etc/puppetlabs/r10k/r10k.yaml'
$r10k_binary = 'r10k'
$pre_postrun_command = "${r10k_binary} deploy environment --modules"
$puppetconf_path = '/etc/puppetlabs/puppet'
$manage_configfile_symlink = false
$configfile_symlink = '/etc/r10k.yaml'
$git_settings = undef
$forge_settings = undef
$deploy_settings = { 'generate_types' => true, 'exclude_spec' => true, }
# Git configuration
$git_server = $settings::ca_server #lint:ignore:top_scope_facts
$repo_path = '/var/repos'
$remote = "ssh://${git_server}${repo_path}/modules.git"

# Gentoo specific values
$gentoo_keywords = ''

# Include the mcollective agent
$mcollective = false

Expand Down Expand Up @@ -93,7 +78,7 @@
$webhook_chatops_token = ''
$webhook_chatops_uri = ''
$webhook_r10k_command_path = "/opt/puppetlabs/puppet/bin/${r10k_binary}"
$webhook_r10k_config_path = $r10k_config_file
$webhook_r10k_config_path = '/etc/puppetlabs/r10k/r10k.yaml'
$webhook_r10k_default_branch = 'production'
$webhook_r10k_branch_prefix = ''
$webhook_r10k_allow_uppercase = false
Expand Down

0 comments on commit 42babe4

Please sign in to comment.