Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400115 )
Change subject: Fix dupe python-setuptools
......................................................................
Fix dupe python-setuptools
The package python-setuptools is included from mwv::packages and is thus
defined via site.pp. That causes duplicate definition errors in at
least:
role::striker
role::keystone
role::horizon
Change-Id: If7f49130eff0c0e45b7a4fdca6c2f61c58462c1e
---
M puppet/modules/role/manifests/keystone.pp
M puppet/modules/swift/manifests/init.pp
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/15/400115/1
diff --git a/puppet/modules/role/manifests/keystone.pp
b/puppet/modules/role/manifests/keystone.pp
index 0bc0ff2..2ea98ce 100644
--- a/puppet/modules/role/manifests/keystone.pp
+++ b/puppet/modules/role/manifests/keystone.pp
@@ -61,12 +61,13 @@
'python-pyparsing',
'python-pysaml2',
'python-routes',
- 'python-setuptools',
'python-sqlalchemy',
'python-unicodecsv',
'python-warlock',
'websockify',
]
+ # Already in mwv::packages
+ require_package('python-setuptools')
package { $packages:
ensure => 'present',
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index 00d792b..473ac1a 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -40,11 +40,12 @@
'python-eventlet',
'python-pkg-resources',
'python-pyasn1',
- 'python-setuptools',
'python-swift*',
'python-webob',
'swift*'
]
+ # Already in mwv::packages
+ require_package('python-setuptools')
package { ['swift', 'swift-account', 'swift-container', 'swift-object',
'swift-proxy', 'python-webob', 'python-swiftclient']:
ensure => 'present',
--
To view, visit https://gerrit.wikimedia.org/r/400115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f49130eff0c0e45b7a4fdca6c2f61c58462c1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
