Signed-off-by: Stephen Gran <steve@lobefin.net>
- require => File['/etc/apt/apt.conf.d/local-recommends']
+ require => File['/etc/apt/apt.conf.d/local-recommends'],
+ stage => deploy_infra
package { 'schroot': ensure => held }
}
package { 'schroot': ensure => held }
}
+ package { 'apt-transport-https':
+ ensure => installed,
+ stage => setup,
+ }
'debootstrap',
'dupload'
]:
'debootstrap',
'dupload'
]:
}
site::linux_module { 'dm_snapshot': }
}
site::linux_module { 'dm_snapshot': }
exec { 'apt-get update':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'apt-get update':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present, $require = []) {
-
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
case $ensure {
present: {
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
case $ensure {
present: {
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
notify => Exec["apt-key-update-${name}"]
}
}
notify => Exec["apt-key-update-${name}"]
}
}
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
- command => "apt-key del ${keyid}",
+ command => "apt-key del ${keyid}",
+ stage => setup,
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
- notify => Exec['apt-get update'],
- require => $require,
+ notify => Exec['apt-get update'],
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- source => $config,
- notify => Exec['apt-get update'],
- require => $require,
+ ensure => $ensure,
+ source => $config,
+ notify => Exec['apt-get update'],