From 454f09d61f87ba36f9e53a38b21e122ebbdb9611 Mon Sep 17 00:00:00 2001 From: tiger-seo Date: Thu, 5 Feb 2015 16:26:43 +0200 Subject: [PATCH] fixes #56: pillar lookup.server value is ignored --- mysql/client.sls | 2 +- mysql/database.sls | 2 +- mysql/server.sls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/client.sls b/mysql/client.sls index b6fae5b..ed2791f 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,5 +1,5 @@ {% 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 = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} mysql: pkg.installed: diff --git a/mysql/database.sls b/mysql/database.sls index ae0a4bc..4f9d502 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -1,5 +1,5 @@ {% 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 = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} {% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} {% set db_states = [] %} diff --git a/mysql/server.sls b/mysql/server.sls index 5983e15..4dcf1dc 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,5 +1,5 @@ {% 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 = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} {% set os = salt['grains.get']('os', None) %} {% set os_family = salt['grains.get']('os_family', None) %}