BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246254
Change subject: Don't provision hhvm config files before package
......................................................................
Don't provision hhvm config files before package
Ensure that Puppet orders creation of hhvm configuration files after the
installation of the hhvm package. This should avoid race conditions
where the package and Puppet both want to control config files which
cause apt to fail on initial package install.
Bug: T115450
Change-Id: I107f3c164669928c00ca8ee31614459c371bea46
---
M puppet/modules/hhvm/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/54/246254/1
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 6765d5d..7c4b3dd 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -64,6 +64,13 @@
notify => Service['hhvm'],
}
+ # T115450: Make all file resources declared here wait until after the hhvm
+ # package is installed. This should avoid race conditions where the hhvm
+ # package creates files that we are intending to overwrite.
+ File {
+ require => Package['hhvm'],
+ }
+
env::alternative { 'hhvm_as_default_php':
alternative => 'php',
target => '/usr/bin/hhvm',
--
To view, visit https://gerrit.wikimedia.org/r/246254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I107f3c164669928c00ca8ee31614459c371bea46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
