From 8b730607b87d28a0e22445fbbd9de328967f7f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Str=C3=B6m?= Date: Thu, 18 Jun 2015 11:42:22 +0200 Subject: [PATCH] Use default root_password if not set --- mysql/user.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/user.sls b/mysql/user.sls index 12f57d1..1832bda 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -1,7 +1,7 @@ {% from "mysql/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} -{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', 'somepass') %} +{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} {%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} {% set user_states = [] %}