Skip to content

Commit

Permalink
rework repo dependency, always before any packages
Browse files Browse the repository at this point in the history
  • Loading branch information
lbetz committed Apr 21, 2020
1 parent cb3eeb7 commit 2ddb3fb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion manifests/redis.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
$user = $::icinga::redis::globals::user
$group = $::icinga::redis::globals::group

class { 'redis':
class { '::redis':
manage_repo => false,
package_name => $package_name,
config_dir => $conf_dir,
Expand Down
4 changes: 3 additions & 1 deletion manifests/repos/apt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

include ::apt
if $configure_backports {
contain ::apt::backports
include ::apt::backports
Apt::Source['backports'] -> Package <| |>
}

$repos.each |String $repo_name, Hash $repo_config| {
Expand All @@ -25,6 +26,7 @@
}
})
}
Apt::Source[$repo_name] -> Package <| |>
}

}
1 change: 1 addition & 0 deletions manifests/repos/yum.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* => merge($repo_config, { enabled => $_enabled[$repo_name] })
}
}
Yumrepo[$repo_name] -> Package <| |>
}

if $configure_scl and $facts['os']['name'] in ['CentOS', 'Scientific'] {
Expand Down
2 changes: 2 additions & 0 deletions manifests/repos/zypper.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
$_proxy = undef
}


exec { "import ${repo_name} gpg key":
path => '/bin:/usr/bin:/sbin:/usr/sbin',
command => "rpm ${_proxy} --import ${repo_config['gpgkey']}",
Expand All @@ -32,6 +33,7 @@
path => "/etc/zypp/repos.d/${repo_name}.repo",
line => "proxy=${repo_config['proxy']}",
}
-> Package <| |>
}
}

Expand Down

0 comments on commit 2ddb3fb

Please sign in to comment.