Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370092 )
Change subject: openstack: clean up openstack::repo
......................................................................
openstack: clean up openstack::repo
* Move key to openstack2
* remove openstack::repo
Bug: T171494
Change-Id: Icd76c5ec4fbfc297baeb7877123070c440306217
---
D modules/openstack/manifests/repo.pp
R modules/openstack2/files/cloudrepo/ubuntu-cloud.key
M modules/openstack2/manifests/cloudrepo.pp
3 files changed, 2 insertions(+), 43 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/repo.pp
b/modules/openstack/manifests/repo.pp
deleted file mode 100644
index 601ec4c..0000000
--- a/modules/openstack/manifests/repo.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# sets upt APT repository for labs openstack.
-# We use the Ubuntu cloud archive for this -- this repo points us to the
-# package versions specified in $::openstack::version
-class openstack::repo(
- $openstack_version=$::openstack::version,
-) {
- # 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 => "trusty-updates/${openstack_version}",
- components => 'main',
- keyfile => 'puppet:///modules/openstack/ubuntu-cloud.key';
- }
- } elsif os_version('debian jessie') {
- # Stock Jessie seems to come with Liberty packages, so only set
- # up a special repo for non-Liberty packages
- if ($openstack_version != 'liberty') {
- apt::conf { "mirantis-${openstack_version}-jessie-proxy":
- priority => '80',
- key =>
"Acquire::http::Proxy::${openstack_version}-jessie.pkgs.mirantis.com",
- value => "http://webproxy.${::site}.wmnet:8080";,
- }
- apt::repository { 'mirantis':
- uri =>
"http://${openstack_version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${openstack_version}-backports",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${openstack_version}.key";
- }
- apt::repository { 'mirantis-nochange':
- uri =>
"http://${openstack_version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${openstack_version}-backports-nochange",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${openstack_version}.key";
- }
- }
- }
-}
diff --git a/modules/openstack/files/ubuntu-cloud.key
b/modules/openstack2/files/cloudrepo/ubuntu-cloud.key
similarity index 100%
rename from modules/openstack/files/ubuntu-cloud.key
rename to modules/openstack2/files/cloudrepo/ubuntu-cloud.key
Binary files differ
diff --git a/modules/openstack2/manifests/cloudrepo.pp
b/modules/openstack2/manifests/cloudrepo.pp
index 6c441ca..8addc8a 100644
--- a/modules/openstack2/manifests/cloudrepo.pp
+++ b/modules/openstack2/manifests/cloudrepo.pp
@@ -1,6 +1,4 @@
-# sets upt APT repository for labs openstack.
-# We use the Ubuntu cloud archive for this -- this repo points us to the
-# package versions specified in $::openstack::version
+# sets upt APT repository for labs openstack
# class default kept here until components not yet moved to profiles
# for parameterization are completed in modules/openstack
@@ -14,10 +12,9 @@
uri => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
dist => "trusty-updates/${version}",
components => 'main',
- keyfile => 'puppet:///modules/openstack/ubuntu-cloud.key';
+ keyfile =>
'puppet:///modules/openstack2/cloudrepo/ubuntu-cloud.key';
}
} elsif os_version('debian jessie') and ($version != 'liberty') {
- # Stock Jessie seems to come with Liberty packages
fail("T169099: There is no plan for ${version} on Jessie")
}
}
--
To view, visit https://gerrit.wikimedia.org/r/370092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd76c5ec4fbfc297baeb7877123070c440306217
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
