Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/369957 )
Change subject: openstack: Jessie has Liberty py3 client libraries
......................................................................
openstack: Jessie has Liberty py3 client libraries
* The mirantis upstream is gone.
* Jessie main is Liberty
* Jessie Liberty already has openstack py3 client libs
* Ubuntu Liberty does not have openstack py3 client libs
* Labstore100[45] seems to have been versioned to mitaka
only in order to get py3 libs which were installed.
However, the old openstack::repo manifest was not correctly
applied. Since Jessie has py3 openstack client libs
in main it did not matter. In fixing the missing
repo things have become broken with the unneeded addition
of the broken mirantis repos :)
* modules/labstore/files/nfs-exportd requires
py3 version of openstack client libs
Abort on Jessie >Liberty until we have a plan.
Bug: T171494
Bug: T169099
Change-Id: I152cba35a35db9e77779ba504e6ba83679a55984
---
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M modules/openstack2/manifests/clientlib.pp
M modules/openstack2/manifests/cloudrepo.pp
6 files changed, 7 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/369957/1
diff --git a/hieradata/hosts/labstore1004.yaml
b/hieradata/hosts/labstore1004.yaml
index e81a0b5..e69de29 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1,2 +0,0 @@
-profile::openstack::main::version: 'mitaka'
-openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml
b/hieradata/hosts/labstore1005.yaml
index e81a0b5..e69de29 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1,2 +0,0 @@
-profile::openstack::main::version: 'mitaka'
-openstack::version: mitaka
diff --git a/hieradata/role/common/labs/nfs/primary.yaml
b/hieradata/role/common/labs/nfs/primary.yaml
index 49afc31..1defc67 100644
--- a/hieradata/role/common/labs/nfs/primary.yaml
+++ b/hieradata/role/common/labs/nfs/primary.yaml
@@ -14,8 +14,5 @@
debdeploy-labsnfs:
value: standard
-profile::openstack::main::version: 'mitaka'
-openstack::version: mitaka
-
admin::groups:
- wmcs-roots
diff --git a/hieradata/role/common/labs/nfs/secondary.yaml
b/hieradata/role/common/labs/nfs/secondary.yaml
index 49afc31..1defc67 100644
--- a/hieradata/role/common/labs/nfs/secondary.yaml
+++ b/hieradata/role/common/labs/nfs/secondary.yaml
@@ -14,8 +14,5 @@
debdeploy-labsnfs:
value: standard
-profile::openstack::main::version: 'mitaka'
-openstack::version: mitaka
-
admin::groups:
- wmcs-roots
diff --git a/modules/openstack2/manifests/clientlib.pp
b/modules/openstack2/manifests/clientlib.pp
index e29da76..48ac7ff 100644
--- a/modules/openstack2/manifests/clientlib.pp
+++ b/modules/openstack2/manifests/clientlib.pp
@@ -21,9 +21,10 @@
}
# assumption is any version not liberty is newer
- if $version != 'liberty' {
- # Python3 client packages are only available in Mitaka
- # and later repos
+ # Debian Jessie on liberty has py3 packages
+ # Ubuntu on liberty /does not/
+
+ if os_version('debian jessie') or os_version('ubuntu trusty') and $version
!= 'liberty' {
$python3packages = [
'python3-keystoneclient',
diff --git a/modules/openstack2/manifests/cloudrepo.pp
b/modules/openstack2/manifests/cloudrepo.pp
index c3736f3..6c441ca 100644
--- a/modules/openstack2/manifests/cloudrepo.pp
+++ b/modules/openstack2/manifests/cloudrepo.pp
@@ -16,27 +16,8 @@
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 ($version != 'liberty') {
- apt::conf { "mirantis-${version}-jessie-proxy":
- priority => '80',
- key =>
"Acquire::http::Proxy::${version}-jessie.pkgs.mirantis.com",
- value => "http://webproxy.${::site}.wmnet:8080";,
- }
- apt::repository { 'mirantis':
- uri =>
"http://${version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${version}-backports",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${version}.key";
- }
- apt::repository { 'mirantis-nochange':
- uri =>
"http://${version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${version}-backports-nochange",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${version}.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/369957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I152cba35a35db9e77779ba504e6ba83679a55984
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
