Ryan Lane has submitted this change and it was merged.

Change subject: Revert "Call apt-get update after adding a new apt repo"
......................................................................


Revert "Call apt-get update after adding a new apt repo"

This reverts commit 42dd3408f18dec2af96059f0a3240df1174bb945.

Change-Id: Ib58c0b7b26f9c9709d7876de9d8becc7f8957c2a
---
M manifests/openstack.pp
M modules/apt/manifests/update.pp
2 files changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Ryan Lane: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index c601efb..e6c4673 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/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/74285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib58c0b7b26f9c9709d7876de9d8becc7f8957c2a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to