Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74294
Change subject: Call apt-get update after adding a new apt repo
......................................................................
Call apt-get update after adding a new apt repo
Change-Id: I6adbb113b9429e99608a2893b9ad8af563b86b90
---
M manifests/openstack.pp
M modules/apt/manifests/repository.pp
M modules/apt/manifests/update.pp
3 files changed, 52 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/74294/1
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index ba32a0c..b0271c2 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -128,8 +128,6 @@
components => 'main',
keyfile => 'puppet:///files/misc/ubuntu-cloud.key';
}
-
- include apt::updatefornewrepo
}
}
diff --git a/modules/apt/manifests/repository.pp
b/modules/apt/manifests/repository.pp
index aa29fd3..aeb0b20 100644
--- a/modules/apt/manifests/repository.pp
+++ b/modules/apt/manifests/repository.pp
@@ -1,51 +1,60 @@
define apt::repository(
- $uri,
- $dist,
- $components,
- $source=true,
- $comment_old=false,
- $keyfile='',
- $ensure=present
+ $uri,
+ $dist,
+ $components,
+ $source=true,
+ $comment_old=false,
+ $keyfile='',
+ $ensure=present
) {
- $binline = "deb ${uri} ${dist} ${components}\n"
- $srcline = $source ? {
- true => "deb-src ${uri} ${dist} ${components}\n",
- default => '',
- }
+ $binline = "deb ${uri} ${dist} ${components}\n"
+ $srcline = $source ? {
+ true => "deb-src ${uri} ${dist} ${components}\n",
+ default => '',
+ }
- file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- owner => root,
- group => root,
- mode => '0444',
- content => "${binline}${srcline}",
- }
+ file { "/etc/apt/sources.list.d/${name}.list":
+ ensure => $ensure,
+ owner => root,
+ group => root,
+ mode => '0444',
+ content => "${binline}${srcline}",
+ }
- if $comment_old {
- $escuri = regsubst(regsubst($uri, '/', '\/', 'G'), '\.', '\.',
'G')
- $binre = "deb(-src)?\s+${escuri}\s+${dist}\s+${components}"
+ if $comment_old {
+ $escuri = regsubst(regsubst($uri, '/', '\/', 'G'), '\.', '\.', 'G')
+ $binre = "deb(-src)?\s+${escuri}\s+${dist}\s+${components}"
- # comment out the old entries in /etc/apt/sources.list
- exec { "apt-${name}-sources":
- command => "/bin/sed -ri '/${binre}/s/^deb/#deb/'
/etc/apt/sources.list",
- creates => "/etc/apt/sources.list.d/${name}.list",
- before => File["/etc/apt/sources.list.d/${name}.list"],
- }
- }
+ # comment out the old entries in /etc/apt/sources.list
+ exec { "apt-${name}-sources":
+ command => "/bin/sed -ri '/${binre}/s/^deb/#deb/'
/etc/apt/sources.list",
+ creates => "/etc/apt/sources.list.d/${name}.list",
+ before => File["/etc/apt/sources.list.d/${name}.list"],
+ }
+ }
- if $keyfile {
- file { "/var/lib/apt/keys/${name}.gpg":
- ensure => present,
- owner => root,
- group => root,
- mode => '0400',
- source => $keyfile,
- require => File['/var/lib/apt/keys']
- }
+ if $keyfile {
+ file { "/var/lib/apt/keys/${name}.gpg":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0400',
+ source => $keyfile,
+ require => File['/var/lib/apt/keys'],
+ before => File["/etc/apt/sources.list.d/${name}.list"],
+ }
- exec { "/usr/bin/apt-key add /var/lib/apt/keys/${name}.gpg":
- subscribe => File["/var/lib/apt/keys/${name}.gpg"],
- refreshonly => true,
- }
- }
+ exec { "/usr/bin/apt-key add /var/lib/apt/keys/${name}.gpg":
+ subscribe => File["/var/lib/apt/keys/${name}.gpg"],
+ refreshonly => true,
+ }
+ }
+
+ exec { 'update-for-new-repo':
+ command => '/usr/bin/apt-get update',
+ timeout => 240,
+ returns => [ 0, 100 ]
+ subscribe => File["/etc/apt/sources.list.d/${name}.list"],
+ refreshonly => true,
+ }
}
diff --git a/modules/apt/manifests/update.pp b/modules/apt/manifests/update.pp
index 4c2857a..9b04600 100644
--- a/modules/apt/manifests/update.pp
+++ b/modules/apt/manifests/update.pp
@@ -4,13 +4,3 @@
returns => [ 0, 100 ];
}
}
-
-class apt::updatefornewrepo {
- exec { 'update-for-new-repo':
- command => '/usr/bin/apt-get update',
- timeout => 240,
- returns => [ 0, 100 ];
- }
-}
-
-Apt::Repository <| |> -> Class['apt::updatefornewrepo']
--
To view, visit https://gerrit.wikimedia.org/r/74294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6adbb113b9429e99608a2893b9ad8af563b86b90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
