Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift_new: add precise support
......................................................................


swift_new: add precise support

Copy over the precise bits from swift.pp, in preparation for applying
swift_new to precise (eqiad) hosts.

Change-Id: Icc3fcaa61282d18d15873cfae56b59470c409189
---
M modules/swift_new/manifests/init.pp
1 file changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/swift_new/manifests/init.pp 
b/modules/swift_new/manifests/init.pp
index 19ba756..83f4a1f 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift_new/manifests/init.pp
@@ -33,6 +33,24 @@
         },
     }
 
+    # this is on purpose not a >=. the cloud archive only exists for
+    # specific distributions, typically LTS releases.
+    if ($::lsbdistcodename == 'precise') {
+        apt::repository { 'ubuntucloud-icehouse':
+            uri        => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+            dist       => 'precise-updates/icehouse',
+            components => 'main',
+            keyfile    => 'puppet:///files/misc/ubuntu-cloud.key',
+            before     => Package['swift'],
+        }
+
+        apt::pin { 'swift-icehouse':
+            package  => '*',
+            pin      => 'release n=precise-updates/icehouse',
+            priority => 1005,
+        }
+    }
+
     package { [
         'swift',
         'python-swift',

-- 
To view, visit https://gerrit.wikimedia.org/r/231233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc3fcaa61282d18d15873cfae56b59470c409189
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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