diff --git a/mysql/client.sls b/mysql/client.sls index b6fae5b87080b4dbbbb6d67803f710018af53df1..ed2791f44980e14421559374d5a463eac0e2528e 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 ae0a4bccd75966b9759c4a7ec2154e94fb0dc26a..4f9d5021acd1be9810ead1edc517af1802f3df37 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 5983e15dd7276b851478befb8561207f5fc33731..4dcf1dcb35c0cb507cfc547fe95ffdc4b48af21b 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) %}