Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330319 )
Change subject: Add mirantis backports repo for Openstack classes on Jessie
......................................................................
Add mirantis backports repo for Openstack classes on Jessie
This won't be used in production for a good long while,
but should help with testing.
Change-Id: I16fabeaf49d6897a1772b540fccc83297b1ea850
---
A modules/openstack/files/mirantis-liberty.key
A modules/openstack/files/mirantis-mitaka.key
M modules/openstack/manifests/repo.pp
3 files changed, 75 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/330319/1
diff --git a/modules/openstack/files/mirantis-liberty.key
b/modules/openstack/files/mirantis-liberty.key
new file mode 100644
index 0000000..050c4c6
--- /dev/null
+++ b/modules/openstack/files/mirantis-liberty.key
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFWUFyUBEADl+6HGQCIWwPG7t5y7PmkNNlGo16w1v9uAtqMtNzWleckdAK7T
+4AVMfKo3HfNfRk556uXubIsmY0amI5zgQuT6ToQU+lMYLUb3M/ToSQdpVFX7BolC
+r2AoUniuC6ldhLZ2nXk81Q8VXjkAAu4iWV4tuy3ndZlq9rtXBtKZ+fTGwiXNTeXv
+d3B7386Z2mR1igcCwzrozTpdGgyPW+s41v0TPWsb8fingWGJ2ddmsB41YacYioGW
+KccMRRJQ9Y+x8fYJ1BfUYKAQs9Irio02bpDTuWiCNVPk7VIMoTH1bguERrojhELw
+kenp9zVGtjgyGXCPfchGOD/LzbEp1S8QppIK7Oo3YS/tNuOoKsOy7LrM1A277vj8
+c+9kNdyBtnrTJy6D8MsVp54No1qUr0FvCvP/irOE61gRhg0vf9QKWwOOeOy91iNx
+98OfYTB0vmdcRgGKrCvHUNOIs+hck5mJbPKKE8eOX+H+OCC1bgtZ2/wk1HvJ07/g
+DGkigANTcHnVvdwNiKdCZ8ShsdsBdVTfSRxvy4jNON0STq6A9NtjZRCFKIndclPL
+3Z4PCtbGWnWc7Crv1oEhFAhlj46Js8BvMsnSJUqQBWS8ZrnAQqx6Vp7Fq7bfxJDp
+1lGQ2Vic618KwID/RBVM2lekDR59dB6HqzF8ZpeBrABz1lqQX0iKyCRxKQARAQAB
+tDxBdXRvZ2VuZXJhdGVkIGtleSA8amVua2luc0BsaWJlcnR5LWplc3NpZS5wa2dz
+Lm1pcmFudGlzLmNvbT6JAjcEEwEIACEFAlWUFyUCGy8FCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQthUac7xDqUe14w//SrMcvbKpKXKsPZFzBURe7QZfTeWvadrx
+m/5r3z/Si0cvFnSjtup8pWvH7qDnCYjRV6mFfePlf/J43xfHDqwOaJbLLc3eQS3Z
+b8UUr1YFDA8wWfd2/dfKdLof/nsYpsswLWStHt4keIA9oeaeWchEPc/rr90x5tkz
+SY8Q5Bo/DzzF8L4k7HYkNP774dqXttZyLA5e4EmgE/TjVtOJxKpjc0a+sRRm9AYH
+Ro4u17gBFuPyHZOYyXnxvzlGfYdxkoRkMB4ZJnHeWdn68dUM2rRrG9lIMB3Xo/aM
+2z06928NhUoTjp8WWzvjsWHgb08NGmzzE3DRcS4E2pK0N50vX0E/GctwNg5MQ6aK
+OtyWXo5UyYBlxTg1q1BS5zziSDEBD4cn71Dy3nKK74Dkvp6SwFzfkjMEQM9dUVLM
+6bSwuduBLqBRn0uoPexVmnxqF7iBLU1UsoXCvgr1gi/RsqRKXi0SLqqne8Sn9+OR
+TaLOzWXX8zVShX0CNNAL0lLZOnDsgv2RQtU5X1cYXXSAjfpotixl8PICBHpWydj4
+xy4wj6uRWybR73FCCUJESkztjHoxYrl5faZsDS3dB55g1mlfoNChmRjCGoPBqg46
+bBhJS67N7s3NxlYfDnvXyCUbKSXi0fOokl1sDBIfdwNDS2BH2PEwdpLIUyisF2VD
+fQvdKE10BE0=
+=X8u/
+-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/modules/openstack/files/mirantis-mitaka.key
b/modules/openstack/files/mirantis-mitaka.key
new file mode 100644
index 0000000..7460036
--- /dev/null
+++ b/modules/openstack/files/mirantis-mitaka.key
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFZS4wcBEADYlpvHBFt4ViqjKeFPqCId/1pp1uzG7bERCoZn1KA1uTgzrTl8
+EsKjrpE01gIanWfHCiyPZG5OmQcNHvXElQB5qjS9SawwyR62c4pDNOLXaVZc3yIw
+OfuayZSOx7Ai1HE3DMPznc5pWyBHvP0POIkN7sJPkE1I1Hxhmh4Swl9OCfAxtWzN
+mN2Df55wOW4pC1jMMtSmOYJopUGl2akxvTr4i/FU2fknrd+Fsode9Nyrkd422lwA
+OYJemzTCoOj61ujPqE5+2785MiZAxkf8m1U7/28AgZYOiYZIyK9U8gMEybj1Xeuu
+ga1wzhfA7ZR8tVqNkErNP99Q7SE+jv/fyGBlOKb5fYKmb8EgIxAAA9JgCc61f45A
+MC0IjVH736MCWuLmjHUITek/OIDpjDMTUX86Z5FzCWCPp8qbdYnWkepFguwoXcBw
+YuSkaRMeA0XaGzTKrhLZns96b/vx92BnplYQezuoUBgXD3t+fxdEnITh6cdx1+Yz
+RVmRtH3DycIanSwXBHuc5mmbFnYXAkxck67OHNcbmH24y2MbcrA2SyIZmz4C63v/
+UgXczU1ziTnHjceyD7rEFn5ku2n7zlO6AiCfet7+SoSumCIkZzmv5ojqwAW4mUl8
+TTqUQOJTh6lSvww/BLBey9IhPNBD69wOu6JYNgYU4+BUl8024rhGyE4CnQARAQAB
+tDtBdXRvZ2VuZXJhdGVkIGtleSA8amVua2luc0BtaXRha2EtamVzc2llLnBrZ3Mu
+bWlyYW50aXMuY29tPokCNwQTAQgAIQUCVlLjBwIbLwULCQgHAwUVCgkICwUWAgMB
+AAIeAQIXgAAKCRBJDKWXjGM8Qz9KEACGFmHnNkyg8Zw4dzv+++NHiL6Ysfkgx7cF
+flOh5lD5XZbOHm20O8vUxP88p9BGzGzRm04G389X2Avk642wdidJ3y2CZ3xPHzD3
+/5BLBezGf2yHr6kISuObJ77ao1xwATkd5adq54T8ADB9dcusuO3UKwi2MNQwIW9W
+PcXqmaiIZQ6zayqnxmDw8U44GvzS8peqB3ZaMWOygoFS6dTFE5fPiS7geBagIBIH
+A+xXzTgdtQwTCVoliYlLLnbedXHRmY7nvPqmIbNFJUFwPYeYKmBjHlkxl93Hc6Vf
+OG4defkYgwbD2CkkIAhpqSwvTXyXuUBNgp1cxZUhsXIk3lrbWQiBr2NAdUPzHWEM
+M7emsl2tc0bTl3xGo4vz+9FXyWRV8yA4qAIngjAb+KPbr2fpVHMO8MkWpBXs6ftJ
+Y8cVkGtz0z8+4KULhN33z6h38IXRr4fvYNl9zur62N0QznpGwaOgHuNVe+/xe139
+xoXmvi5/O55++Ym/pkP8fhu+DwW9QvWFZA+ZHI5u6e/ZaBsMblC2dUuKYXM1LWWf
+grroEL6PgshcX2DEaY0KkVPAaSAXTrLkXmvYaMEb0VyceVvpgtf1pUEN1nhHv7Qx
+DfthQkZlA7gdTZPwFaUKsvQa16mI+FRGcJGoC7yHnExk1jMopfR3pRPTTroImNms
+M3Nf4NjkVw==
+=UsOp
+-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/modules/openstack/manifests/repo.pp
b/modules/openstack/manifests/repo.pp
index e9d0d1b..ad22338 100644
--- a/modules/openstack/manifests/repo.pp
+++ b/modules/openstack/manifests/repo.pp
@@ -12,5 +12,18 @@
components => 'main',
keyfile => 'puppet:///modules/openstack/ubuntu-cloud.key';
}
+ } elsif os_version('debian jessie') {
+ 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";
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16fabeaf49d6897a1772b540fccc83297b1ea850
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
