[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: scholarships: ensure db created before schema load

2017-09-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380912 )

Change subject: scholarships: ensure db created before schema load
..


scholarships: ensure db created before schema load

Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2
---
M puppet/modules/scholarships/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/scholarships/manifests/init.pp 
b/puppet/modules/scholarships/manifests/init.pp
index fff044a..492a4e5 100644
--- a/puppet/modules/scholarships/manifests/init.pp
+++ b/puppet/modules/scholarships/manifests/init.pp
@@ -67,7 +67,10 @@
 mysql::sql { 'Load scholarships schema':
 sql => "USE ${db_name}; SOURCE 
${deploy_dir}/data/db/schema.mysql;",
 unless  => template('scholarships/load_schema_unless.sql.erb'),
-require => Git::Clone['wikimedia/wikimania-scholarships'],
+require => [
+Git::Clone['wikimedia/wikimania-scholarships'],
+Mysql::Db[$db_name],
+],
 }
 
 mysql::sql { 'create_scholarships_admin_user':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: scholarships: ensure db created before schema load

2017-09-26 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380912 )

Change subject: scholarships: ensure db created before schema load
..

scholarships: ensure db created before schema load

Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2
---
M puppet/modules/scholarships/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/12/380912/1

diff --git a/puppet/modules/scholarships/manifests/init.pp 
b/puppet/modules/scholarships/manifests/init.pp
index fff044a..492a4e5 100644
--- a/puppet/modules/scholarships/manifests/init.pp
+++ b/puppet/modules/scholarships/manifests/init.pp
@@ -67,7 +67,10 @@
 mysql::sql { 'Load scholarships schema':
 sql => "USE ${db_name}; SOURCE 
${deploy_dir}/data/db/schema.mysql;",
 unless  => template('scholarships/load_schema_unless.sql.erb'),
-require => Git::Clone['wikimedia/wikimania-scholarships'],
+require => [
+Git::Clone['wikimedia/wikimania-scholarships'],
+Mysql::Db[$db_name],
+],
 }
 
 mysql::sql { 'create_scholarships_admin_user':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits