BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393493 )
Change subject: puppet4: Update $::LOAD_* for Puppet4 compatibility ...................................................................... puppet4: Update $::LOAD_* for Puppet4 compatibility Puppet4 requires variables to begin with a lowercase letter, so change our "constants" from uppercase to lowercase. Bug: T181354 Change-Id: I753a57d55636c5a398d2b80cfe976946367d3c51 --- M puppet/manifests/site.pp M puppet/modules/mediawiki/manifests/wiki.pp M puppet/modules/role/manifests/articlecreationworkflow.pp M puppet/modules/role/manifests/articleplaceholder.pp M puppet/modules/role/manifests/betafeatures.pp M puppet/modules/role/manifests/cldr.pp M puppet/modules/role/manifests/commons.pp M puppet/modules/role/manifests/education.pp M puppet/modules/role/manifests/eventbus.pp M puppet/modules/role/manifests/eventlogging.pp M puppet/modules/role/manifests/flow.pp M puppet/modules/role/manifests/gadgets2.pp M puppet/modules/role/manifests/geodata.pp M puppet/modules/role/manifests/geodata_elastic.pp M puppet/modules/role/manifests/jsonconfig.pp M puppet/modules/role/manifests/offline.pp M puppet/modules/role/manifests/poolcounter.pp M puppet/modules/role/manifests/questycaptcha.pp M puppet/modules/role/manifests/restbase.pp M puppet/modules/role/manifests/semanticmediawiki.pp M puppet/modules/role/manifests/visualeditor.pp M puppet/modules/role/manifests/wikidata.pp M puppet/modules/role/manifests/zero.pp 23 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/93/393493/1 diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index e67bd18..a71ba7f 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -17,11 +17,11 @@ # Human-readable constants which may be used in lieu of literal numbers # for specifying loading priority of resource types which support this # notion (like mediawiki::extension, mediawiki::settings, and mediawiki::wiki). -$LOAD_FIRST = 0 -$LOAD_EARLY = 5 -$LOAD_NORMAL = 10 -$LOAD_LATER = 15 -$LOAD_LAST = 20 +$load_first = 0 +$load_early = 5 +$load_normal = 10 +$load_later = 15 +$load_last = 20 # Declares a default search path for executables, allowing the path to # be omitted from individual resources. Also configures Puppet to log diff --git a/puppet/modules/mediawiki/manifests/wiki.pp b/puppet/modules/mediawiki/manifests/wiki.pp index dc0fab8..ca75d3e 100644 --- a/puppet/modules/mediawiki/manifests/wiki.pp +++ b/puppet/modules/mediawiki/manifests/wiki.pp @@ -65,7 +65,7 @@ # # [*priority*] # Position of this wiki in foreachwiki. Uses the scale of -# the LOAD_ constants from site.php. (default: $LOAD_NORMAL) +# the $::load_* constants from site.php. (default: $::load_normal) # # [*wgconf*] # Hash of extra wgConf settings for this wiki. One use case for this is @@ -102,7 +102,7 @@ $upload_path = "/${title}images", $server_url = "http://${title}${::mediawiki::multiwiki::base_domain}${::port_fragment}", $primary_wiki = false, - $priority = $::LOAD_NORMAL, + $priority = $::load_normal, $wgconf = {}, ) { include ::mwv diff --git a/puppet/modules/role/manifests/articlecreationworkflow.pp b/puppet/modules/role/manifests/articlecreationworkflow.pp index cd31439..7641e58 100644 --- a/puppet/modules/role/manifests/articlecreationworkflow.pp +++ b/puppet/modules/role/manifests/articlecreationworkflow.pp @@ -4,6 +4,6 @@ # [1] https://www.mediawiki.org/wiki/Extension:ArticleCreationWorkflow class role::articlecreationworkflow { mediawiki::extension { 'ArticleCreationWorkflow': - priority => $::LOAD_EARLY, # Must load before VisualEditor + priority => $::load_early, # Must load before VisualEditor } } diff --git a/puppet/modules/role/manifests/articleplaceholder.pp b/puppet/modules/role/manifests/articleplaceholder.pp index 606b400..58cd876 100644 --- a/puppet/modules/role/manifests/articleplaceholder.pp +++ b/puppet/modules/role/manifests/articleplaceholder.pp @@ -14,7 +14,7 @@ values => { "wgWBRepoSettings['allowEntityImport']" => true, }, - priority => $::LOAD_LATER, + priority => $::load_later, } mediawiki::import::dump { 'ImportImageProperty': diff --git a/puppet/modules/role/manifests/betafeatures.pp b/puppet/modules/role/manifests/betafeatures.pp index 3d10cb2..f3fb49f 100644 --- a/puppet/modules/role/manifests/betafeatures.pp +++ b/puppet/modules/role/manifests/betafeatures.pp @@ -3,6 +3,6 @@ class role::betafeatures { mediawiki::extension { 'BetaFeatures': needs_update => true, - priority => $::LOAD_EARLY, + priority => $::load_early, } } diff --git a/puppet/modules/role/manifests/cldr.pp b/puppet/modules/role/manifests/cldr.pp index 039893e..2d7e2db 100644 --- a/puppet/modules/role/manifests/cldr.pp +++ b/puppet/modules/role/manifests/cldr.pp @@ -8,6 +8,6 @@ require_package('unzip') mediawiki::extension { 'cldr': - priority => $::LOAD_LATER, + priority => $::load_later, } } diff --git a/puppet/modules/role/manifests/commons.pp b/puppet/modules/role/manifests/commons.pp index 211763d..8f67e6b 100644 --- a/puppet/modules/role/manifests/commons.pp +++ b/puppet/modules/role/manifests/commons.pp @@ -14,7 +14,7 @@ mediawiki::wiki { 'commons': upload_dir => $upload_dir, - priority => $::LOAD_EARLY, + priority => $::load_early, } role::thumb_on_404::multiwiki { 'commons': } diff --git a/puppet/modules/role/manifests/education.pp b/puppet/modules/role/manifests/education.pp index a272879..a0e3dd0 100644 --- a/puppet/modules/role/manifests/education.pp +++ b/puppet/modules/role/manifests/education.pp @@ -7,6 +7,6 @@ mediawiki::extension { 'EducationProgram': needs_update => true, - priority => $::LOAD_LAST, # load *after* CLDR + priority => $::load_last, # load *after* CLDR } } diff --git a/puppet/modules/role/manifests/eventbus.pp b/puppet/modules/role/manifests/eventbus.pp index 036f545..2de1a39 100644 --- a/puppet/modules/role/manifests/eventbus.pp +++ b/puppet/modules/role/manifests/eventbus.pp @@ -12,7 +12,7 @@ include ::changeprop mediawiki::extension { 'EventBus': - priority => $::LOAD_EARLY, + priority => $::load_early, settings => { wgEventServiceUrl => 'http://localhost:8085/v1/events', }, diff --git a/puppet/modules/role/manifests/eventlogging.pp b/puppet/modules/role/manifests/eventlogging.pp index 26b602d..0272765 100644 --- a/puppet/modules/role/manifests/eventlogging.pp +++ b/puppet/modules/role/manifests/eventlogging.pp @@ -17,7 +17,7 @@ include ::eventlogging::devserver mediawiki::extension { 'EventLogging': - priority => $::LOAD_EARLY, + priority => $::load_early, settings => { wgEventLoggingBaseUri => '/event.gif', } diff --git a/puppet/modules/role/manifests/flow.pp b/puppet/modules/role/manifests/flow.pp index 35f45bd..a3281cd 100644 --- a/puppet/modules/role/manifests/flow.pp +++ b/puppet/modules/role/manifests/flow.pp @@ -9,7 +9,7 @@ mediawiki::extension { 'Flow': needs_update => true, settings => template('role/flow/conf.php.erb'), - priority => $::LOAD_LAST, # load *after* Echo + priority => $::load_last, # load *after* Echo browser_tests => '.', } diff --git a/puppet/modules/role/manifests/gadgets2.pp b/puppet/modules/role/manifests/gadgets2.pp index 0c70886..399d49b 100644 --- a/puppet/modules/role/manifests/gadgets2.pp +++ b/puppet/modules/role/manifests/gadgets2.pp @@ -16,7 +16,7 @@ } mediawiki::wiki { 'gadgets': - priority => $::LOAD_EARLY, + priority => $::load_early, } mediawiki::wiki { 'gadgetsclient': } diff --git a/puppet/modules/role/manifests/geodata.pp b/puppet/modules/role/manifests/geodata.pp index 20cae91..9359775 100644 --- a/puppet/modules/role/manifests/geodata.pp +++ b/puppet/modules/role/manifests/geodata.pp @@ -5,6 +5,6 @@ mediawiki::extension { 'GeoData': needs_update => true, # Should come after either CirrusSearch or Solarium. - priority => $::LOAD_LATER, + priority => $::load_later, } } diff --git a/puppet/modules/role/manifests/geodata_elastic.pp b/puppet/modules/role/manifests/geodata_elastic.pp index 219f0e2..cadabd7 100644 --- a/puppet/modules/role/manifests/geodata_elastic.pp +++ b/puppet/modules/role/manifests/geodata_elastic.pp @@ -6,7 +6,7 @@ include ::role::cirrussearch mediawiki::settings { 'GeoData-elastic': - priority => $::LOAD_LAST, + priority => $::load_last, values => { wgGeoDataBackend => 'elastic', }, diff --git a/puppet/modules/role/manifests/jsonconfig.pp b/puppet/modules/role/manifests/jsonconfig.pp index 72af944..83e0b95 100644 --- a/puppet/modules/role/manifests/jsonconfig.pp +++ b/puppet/modules/role/manifests/jsonconfig.pp @@ -6,6 +6,6 @@ mediawiki::extension { 'JsonConfig': # Ensure that extensions that use JsonConfig will load later. - priority => $::LOAD_EARLY, + priority => $::load_early, } } diff --git a/puppet/modules/role/manifests/offline.pp b/puppet/modules/role/manifests/offline.pp index b95d6c0..9437f5c 100644 --- a/puppet/modules/role/manifests/offline.pp +++ b/puppet/modules/role/manifests/offline.pp @@ -11,7 +11,7 @@ mediawiki::settings { 'Electron-VRS': values => template('role/offline/electron-vrs.php.erb'), - priority => $::LOAD_FIRST, + priority => $::load_first, } mediawiki::extension { 'Collection': diff --git a/puppet/modules/role/manifests/poolcounter.pp b/puppet/modules/role/manifests/poolcounter.pp index 19b5bdd..401f285 100644 --- a/puppet/modules/role/manifests/poolcounter.pp +++ b/puppet/modules/role/manifests/poolcounter.pp @@ -13,7 +13,7 @@ } mediawiki::extension { 'PoolCounter': - priority => $::LOAD_EARLY, + priority => $::load_early, settings => [ '$wgPoolCountClientConf["servers"][] = "127.0.0.1";', '$wgPoolCountClientConf["timeout"] = 0.5;', diff --git a/puppet/modules/role/manifests/questycaptcha.pp b/puppet/modules/role/manifests/questycaptcha.pp index 50831a1..2517b7f 100644 --- a/puppet/modules/role/manifests/questycaptcha.pp +++ b/puppet/modules/role/manifests/questycaptcha.pp @@ -8,7 +8,7 @@ mediawiki::settings { 'QuestyCaptcha': values => template('role/questycaptcha/settings.php.erb'), - priority => $::LOAD_LATER, + priority => $::load_later, } mediawiki::import::text { 'VagrantRoleQuestyCaptcha': diff --git a/puppet/modules/role/manifests/restbase.pp b/puppet/modules/role/manifests/restbase.pp index 718c57d..d8318dc 100644 --- a/puppet/modules/role/manifests/restbase.pp +++ b/puppet/modules/role/manifests/restbase.pp @@ -35,7 +35,7 @@ # Register the PHP Virtual REST Service connector mediawiki::settings { 'RESTBase-VRS': values => template('role/restbase/vrs.php.erb'), - priority => $::LOAD_FIRST, + priority => $::load_first, wiki => $::mediawiki::wiki_db, } @@ -51,7 +51,7 @@ wgVisualEditorFullRestbaseURL => $base_url, wgVisualEditorRestbaseURL => $ve_url, }, - priority => $::LOAD_EARLY, + priority => $::load_early, wiki => $::mediawiki::wiki_db, } diff --git a/puppet/modules/role/manifests/semanticmediawiki.pp b/puppet/modules/role/manifests/semanticmediawiki.pp index 606cdc0..2410266 100644 --- a/puppet/modules/role/manifests/semanticmediawiki.pp +++ b/puppet/modules/role/manifests/semanticmediawiki.pp @@ -12,7 +12,7 @@ } mediawiki::settings { 'Semantic MediaWiki': - priority => $::LOAD_EARLY, + priority => $::load_early, values => [ 'enableSemantics($wgSitename)', ] diff --git a/puppet/modules/role/manifests/visualeditor.pp b/puppet/modules/role/manifests/visualeditor.pp index 2e25455..8ae9547 100644 --- a/puppet/modules/role/manifests/visualeditor.pp +++ b/puppet/modules/role/manifests/visualeditor.pp @@ -17,7 +17,7 @@ mediawiki::extension { 'VisualEditor': settings => template('role/visualeditor/conf.php.erb'), browser_tests => 'modules/ve-mw/tests/browser', - priority => $::LOAD_EARLY, + priority => $::load_early, wiki => $::mediawiki::wiki_db, } } diff --git a/puppet/modules/role/manifests/wikidata.pp b/puppet/modules/role/manifests/wikidata.pp index 5bc267e..9ef3ada 100644 --- a/puppet/modules/role/manifests/wikidata.pp +++ b/puppet/modules/role/manifests/wikidata.pp @@ -41,7 +41,7 @@ } mediawiki::settings { 'WikiData-Init': - priority => $::LOAD_EARLY, + priority => $::load_early, values => template('role/wikidata/init.php.erb'), } diff --git a/puppet/modules/role/manifests/zero.pp b/puppet/modules/role/manifests/zero.pp index 217b03b..cf209e0 100644 --- a/puppet/modules/role/manifests/zero.pp +++ b/puppet/modules/role/manifests/zero.pp @@ -11,7 +11,7 @@ include ::role::zend mediawiki::extension { 'ZeroBanner': - priority => $::LOAD_LATER, # Must be after JsonConfig & MobileFrontEnd + priority => $::load_later, # Must be after JsonConfig & MobileFrontEnd settings => [ '$wgMobileUrlTemplate = "%h0.m.%h1.%h2"', '$wgZeroSiteOverride = array( "wikipedia", "en" )', @@ -21,7 +21,7 @@ } mediawiki::extension { 'ZeroPortal': - priority => $::LOAD_LAST, # Must be after ZeroBanner + priority => $::load_last, # Must be after ZeroBanner settings => [ '$wgRawHtml = true', ], -- To view, visit https://gerrit.wikimedia.org/r/393493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I753a57d55636c5a398d2b80cfe976946367d3c51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: stretch-migration Gerrit-Owner: BryanDavis <bda...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits