D3125.id7966.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3125.id7966.diff
View Options

	diff --git a/pillar/dbserver/cluster-B.sls b/pillar/dbserver/cluster-B.sls
	--- a/pillar/dbserver/cluster-B.sls
	+++ b/pillar/dbserver/cluster-B.sls
	@@ -88,6 +88,23 @@
	- database: zed_prod
	scope: database

	+ ###
	+ ### Maintenance accounts
	+ ###
	+
	+ dereckson:
	+ password: dbserver/cluster-B/users/dereckson
	+ host: *windriver
	+ privileges:
	+ - database: Nasqueron
	+ scope: database
	+ - database: datacubes
	+ scope: database
	+ - database: datasource_%
	+ scope: database
	+ - database: wolfplex_%
	+ scope: database
	+
	# Notes for databases encoding and collation:
	#
	# This is a MariaDB cluster. At version 10.6, MariaDB is still using utf8mb3
	diff --git a/roles/dbserver-mysql/content/init.sls b/roles/dbserver-mysql/content/init.sls
	--- a/roles/dbserver-mysql/content/init.sls
	+++ b/roles/dbserver-mysql/content/init.sls
	@@ -72,8 +72,10 @@
	- host: {{ user_args["host"] \| yaml_dquote }}
	- require:
	- dbserver_mysql_user_{{ username }}
	+{% if "%" not in privilege["database"] %}
	- dbserver_mysql_db_{{ privilege["database"] }}
	{% endif %}
	+{% endif %}

	{% if privilege["scope"] == "table" %}
	{% for table in privilege["tables"] %}