jenkins-bot has submitted this change and it was merged.
Change subject: Swift role needs to create the wiki-local-thumb container
......................................................................
Swift role needs to create the wiki-local-thumb container
This used to be taken care of by mediawiki when the first thumb needed
to be generated. But mediawiiki doesn't handle that anymore when
thumbor is used.
Bug: T123278
Change-Id: I5db8e21f95917e31e138b86b9058c7c07fca273f
---
M puppet/modules/swift/manifests/init.pp
1 file changed, 6 insertions(+), 20 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index 1577ec2..71f949f 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -139,27 +139,13 @@
],
}
- file { '/tmp/foo':
- ensure => present,
- content => 'bar',
- mode => '0644',
+ swift::container { 'wiki-local-public':
+ public => true,
+ require => Exec['swift-init'],
}
- exec { 'swift-create-public-container':
- command => "swift -A http://127.0.0.1:${port}/auth/v1.0 -U
${project}:${user} -K ${key} upload wiki-local-public /tmp/foo",
- user => 'root',
- unless => "curl -s -o /dev/null -w \"%{http_code}\"
http://127.0.0.1:${port}/v1/AUTH_${project}/wiki-local-public/tmp/foo | grep
-Pq '200'",
- require => [
- Exec['swift-init'],
- File['/tmp/foo'],
- ],
- notify => Exec['swift-make-container-public'],
- }
-
- exec { 'swift-make-container-public':
- command => "swift -A http://127.0.0.1:${port}/auth/v1.0 -U
${project}:${user} -K ${key} post -r '.r:*' wiki-local-public",
- user => 'root',
- require => Exec['swift-create-public-container'],
- refreshonly => true,
+ swift::container { 'wiki-local-thumb':
+ public => true,
+ require => Exec['swift-init'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/276481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5db8e21f95917e31e138b86b9058c7c07fca273f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
