Andrew Bogott has submitted this change and it was merged.

Change subject: nodepool: use OpenStack modules from jessie-backports
......................................................................


nodepool: use OpenStack modules from jessie-backports

Nodepool 0.1.0 requires python-novaclient >= 2.21.0 while Jessie
provides 2.18.1.
Pin python-novaclient to jessie-backports which has 2.23.0.

The OpenStack client utility needs to be backported as well or it emits
a warning and errors out:

  $ openstack server list
  /usr/lib/python2.7/dist-packages/novaclient/v1_1/__init__.py:30:
  UserWarning: Module novaclient.v1_1 is deprecated (taken as a basis
  for novaclient.v2). The preferable way to get client class or object
  you can find in novaclient.client module.
  warnings.warn("Module novaclient.v1_1 is deprecated (taken as a basis
  for "
  ERROR: openstack url_for() got an unexpected keyword argument
  'volume_service_name'
  $

Bug: T104971
Change-Id: I4a787185bdcb6b12566c85687b2139858c4dc04c
---
M modules/nodepool/manifests/init.pp
1 file changed, 19 insertions(+), 5 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/nodepool/manifests/init.pp 
b/modules/nodepool/manifests/init.pp
index 99a0015..ac15dc5 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -56,6 +56,25 @@
     package { 'nodepool':
         ensure => present,
     }
+    # Nodepool 0.1.0 requires novaclient>=2.21.0
+    # Jessie has 2.18.1  (T104971)
+    apt::pin { 'python-novaclient':
+        pin      => 'release a=jessie-backports',
+        priority => '1001',
+        before   => Package['nodepool'],
+    }
+    apt::pin { 'python-openstackclient':
+        pin      => 'release a=jessie-backports',
+        priority => '1001',
+        before   => Package['nodepool'],
+    }
+
+    # OpenStack CLI
+    package { 'python-openstackclient':
+        ensure  => present,
+        require => Apt::Pin['python-openstackclient'],
+    }
+
     # python-diskimage-builder 0.1.46 missing dependency:
     # https://bugs.debian.org/791655
     package { 'uuid-runtime':
@@ -138,11 +157,6 @@
         group   => 'nodepool',
         mode    => '0440',
         content => shell_exports($nodepool_user_env),
-    }
-
-    # OpenStack CLI
-    package { 'python-openstackclient':
-        ensure => present,
     }
 
     file { '/var/lib/nodepool/.ssh':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a787185bdcb6b12566c85687b2139858c4dc04c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to