Andrew Bogott has submitted this change and it was merged.
Change subject: openstack: cleanup up old repo setups
......................................................................
openstack: cleanup up old repo setups
We are solid on trusty/kilo now
Change-Id: Ice2e75e49887148f09296e012c0d418a9d35c5a9
---
M modules/openstack/manifests/repo.pp
1 file changed, 3 insertions(+), 15 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/repo.pp
b/modules/openstack/manifests/repo.pp
index cf5036b..ccc8ecd 100644
--- a/modules/openstack/manifests/repo.pp
+++ b/modules/openstack/manifests/repo.pp
@@ -1,25 +1,13 @@
class openstack::repo(
$openstack_version=$::openstack::version,
) {
-
- if ($::lsbdistcodename == 'precise') {
+ # As of 26/10/2015 we support kilo on trusty (lsb_release -c)
+ if ($::lsbdistcodename == 'trusty') {
apt::repository { 'ubuntucloud':
uri => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
- dist => "precise-updates/${openstack_version}",
+ dist => "trusty-updates/${openstack_version}",
components => 'main',
keyfile => 'puppet:///files/misc/ubuntu-cloud.key';
- }
- }
- if ($::lsbdistcodename == 'trusty') {
- # Icehouse is the default on trusty, no need to use the cloud archive.
- if ($openstack_version != 'icehouse')
- {
- apt::repository { 'ubuntucloud':
- uri =>
'http://ubuntu-cloud.archive.canonical.com/ubuntu',
- dist => "trusty-updates/${openstack_version}",
- components => 'main',
- keyfile => 'puppet:///files/misc/ubuntu-cloud.key';
- }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/248882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice2e75e49887148f09296e012c0d418a9d35c5a9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
