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 <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
