Skip to content

Commit

Permalink
(MODULES-4973) rip out data in modules
Browse files Browse the repository at this point in the history
this module is not able to find a value for `$keyserver` when it is
included in postgresql, as stated in the ticket. this changes the module
back to using the params.pp model. we can revisit data in modules once
LTS moves up from 4.7.0. for now, we need the compatibility.
  • Loading branch information
eputnam committed May 25, 2017
1 parent 44c0348 commit 33d17cf
Show file tree
Hide file tree
Showing 11 changed files with 158 additions and 86 deletions.
5 changes: 0 additions & 5 deletions data/Debian-6.0.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions data/Debian.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions data/Ubuntu-10.04.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions data/Ubuntu-12.04.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions data/Ubuntu-14.04.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions data/Ubuntu.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions data/common.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions hiera.yaml

This file was deleted.

54 changes: 27 additions & 27 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@
# Manage APT (Advanced Packaging Tool)
#
class apt (
Hash $update_defaults,
Hash $purge_defaults,
Hash $proxy_defaults,
Hash $include_defaults,
String $provider,
String $keyserver,
Optional[String] $ppa_options,
Optional[String] $ppa_package,
Optional[Hash] $backports,
Hash $confs = {},
Hash $update = {},
Hash $purge = {},
Hash $proxy = {},
Hash $sources = {},
Hash $keys = {},
Hash $ppas = {},
Hash $pins = {},
Hash $settings = {},
String $root = '/etc/apt',
String $sources_list = "${root}/sources.list",
String $sources_list_d = "${root}/sources.list.d",
String $conf_d = "${root}/apt.conf.d",
String $preferences = "${root}/preferences",
String $preferences_d = "${root}/preferences.d",
Hash $config_files = { conf => { path => $conf_d, ext => '' }, pref => { path => $preferences_d, ext => '.pref' }, list => { path => $sources_list_d, ext => '.list' } },
Hash $source_key_defaults = { 'server' => $keyserver, 'options' => undef, 'content' => undef, 'source' => undef },
) {
Hash $update_defaults = $apt::params::update_defaults,
Hash $purge_defaults = $apt::params::purge_defaults,
Hash $proxy_defaults = $apt::params::proxy_defaults,
Hash $include_defaults = $apt::params::include_defaults,
String $provider = $apt::params::provider,
String $keyserver = $apt::params::keyserver,
Optional[String] $ppa_options = $apt::params::ppa_options,
Optional[String] $ppa_package = $apt::params::ppa_package,
Optional[Hash] $backports = $apt::params::backports,
Hash $confs = $apt::params::confs,
Hash $update = $apt::params::update,
Hash $purge = $apt::params::purge,
Hash $proxy = $apt::params::proxy,
Hash $sources = $apt::params::sources,
Hash $keys = $apt::params::keys,
Hash $ppas = $apt::params::ppas,
Hash $pins = $apt::params::pins,
Hash $settings = $apt::params::settings,
String $root = $apt::params::root,
String $sources_list = $apt::params::sources_list,
String $sources_list_d = $apt::params::sources_list_d,
String $conf_d = $apt::params::conf_d,
String $preferences = $apt::params::preferences,
String $preferences_d = $apt::params::preferences_d,
Hash $config_files = $apt::params::config_files,
Hash $source_key_defaults = $apt::params::source_key_defaults
) inherits apt::params {

if $facts['osfamily'] != 'Debian' {
fail('This module only works on Debian or derivatives like Ubuntu')
Expand Down
130 changes: 130 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
class apt::params {

if $::osfamily != 'Debian' {
fail('This module only works on Debian or derivatives like Ubuntu')
}

$root = '/etc/apt'
$provider = '/usr/bin/apt-get'
$sources_list = "${root}/sources.list"
$sources_list_d = "${root}/sources.list.d"
$conf_d = "${root}/apt.conf.d"
$preferences = "${root}/preferences"
$preferences_d = "${root}/preferences.d"
$keyserver = 'keyserver.ubuntu.com'
$confs = {}
$update = {}
$purge = {}
$proxy = {}
$sources = {}
$keys = {}
$ppas = {}
$pins = {}
$settings = {}

$config_files = {
'conf' => {
'path' => $conf_d,
'ext' => '',
},
'pref' => {
'path' => $preferences_d,
'ext' => '.pref',
},
'list' => {
'path' => $sources_list_d,
'ext' => '.list',
}
}

$update_defaults = {
'frequency' => 'reluctantly',
'timeout' => undef,
'tries' => undef,
}

$proxy_defaults = {
'ensure' => undef,
'host' => undef,
'port' => 8080,
'https' => false,
}

$purge_defaults = {
'sources.list' => false,
'sources.list.d' => false,
'preferences' => false,
'preferences.d' => false,
}

$source_key_defaults = {
'server' => $keyserver,
'options' => undef,
'content' => undef,
'source' => undef,
}

$include_defaults = {
'deb' => true,
'src' => false,
}

case $facts['os']['name']{
'Debian': {
case $facts['os']['release']['full'] {
'6.0': {
$backports = {
'location' => 'http://httpredir.debian.org/debian-backports',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
}
default: {
$backports = {
'location' => 'http://httpredir.debian.org/debian',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
}
}

$ppa_options = undef
$ppa_package = undef

}
'Ubuntu': {
$backports = {
'location' => 'http://archive.ubuntu.com/ubuntu',
'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
'repos' => 'main universe multiverse restricted',
}

case $facts['os']['release']['full'] {
'10.04': {
$ppa_options = undef
$ppa_package = 'python-software-properties'
}
'12.04': {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
}
'14.04', '14.10', '15.04', '15.10': {
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
}
default: {
$ppa_options = '-y'
$ppa_package = 'python-software-properties'
}
}
}
undef: {
fail('Unable to determine full release number')
}
default: {
$ppa_options = undef
$ppa_package = undef
$backports = undef
}
}
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":">= 4.16.0 < 5.0.0"}
],
"data_provider": "hiera",
"data_provider": null,
"operatingsystem_support": [
{
"operatingsystem": "Debian",
Expand Down

0 comments on commit 33d17cf

Please sign in to comment.