[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: break Mysql::User['vagrant'] dependency cycle

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400125 )

Change subject: mysql: break Mysql::User['vagrant'] dependency cycle
..


mysql: break Mysql::User['vagrant'] dependency cycle

Exclude Mysql::User['vagrant'] from contract that Mysql::Db resources
must be created before Mysql::User resources. Because
Mysql::User['vagrant'] is included in Class['mysql'] it would otherwise
create a dependency cycle with any lass which requires Class['mysql']
(directly or indirectly) and also uses Mysql::Db.

Bug: T181918
Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
---
M puppet/modules/mysql/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f7b85da..7c1b249 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -50,5 +50,7 @@
 
 # Create databases before creating users. User resources sometime
 # depend on databases for GRANTs, but the reverse is never true.
-Mysql::Db <| |> -> Mysql::User <| |>
+# NOTE: Mysql::User['vagrant'] is excluded as it would create a dependency
+# cycle in classes which require this class.
+Mysql::Db <| |> -> Mysql::User <| title != 'vagrant' |>
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
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[stretch-migration]: mysql: break Mysql::User['vagrant'] dependency cycle

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400125 )

Change subject: mysql: break Mysql::User['vagrant'] dependency cycle
..

mysql: break Mysql::User['vagrant'] dependency cycle

Exclude Mysql::User['vagrant'] from contract that Mysql::Db resources
must be created before Mysql::User resources. Because
Mysql::User['vagrant'] is included in Class['mysql'] it would otherwise
create a dependency cycle with any lass which requires Class['mysql']
(directly or indirectly) and also uses Mysql::Db.

Bug: T181918
Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
---
M puppet/modules/mysql/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/25/400125/1

diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f7b85da..929ed2c 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -50,5 +50,5 @@
 
 # Create databases before creating users. User resources sometime
 # depend on databases for GRANTs, but the reverse is never true.
-Mysql::Db <| |> -> Mysql::User <| |>
+Mysql::Db <| |> -> Mysql::User <| title != 'vagrant' |>
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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