From 9f3678bbe227689ff636ad40a3b9b84e11982393 Mon Sep 17 00:00:00 2001 From: Seth House Date: Tue, 3 Sep 2013 13:34:10 -0600 Subject: [PATCH] Renamed package-map.jinja to map.jinja; is used for more than package names --- mysql/client.sls | 2 +- mysql/{package-map.jinja => map.jinja} | 0 mysql/python.sls | 2 +- mysql/server.sls | 2 +- pillar.example | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename mysql/{package-map.jinja => map.jinja} (100%) diff --git a/mysql/client.sls b/mysql/client.sls index 99c6051..8fe378f 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,4 +1,4 @@ -{% from "mysql/package-map.jinja" import mysql with context %} +{% from "mysql/map.jinja" import mysql with context %} mysql: pkg: diff --git a/mysql/package-map.jinja b/mysql/map.jinja similarity index 100% rename from mysql/package-map.jinja rename to mysql/map.jinja diff --git a/mysql/python.sls b/mysql/python.sls index 2c38f04..598110c 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -1,4 +1,4 @@ -{% from "mysql/package-map.jinja" import mysql with context %} +{% from "mysql/map.jinja" import mysql with context %} mysql-python: pkg: diff --git a/mysql/server.sls b/mysql/server.sls index 0a1c37a..839bf31 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "mysql/package-map.jinja" import mysql with context %} +{% from "mysql/map.jinja" import mysql with context %} mysqld: pkg: diff --git a/pillar.example b/pillar.example index 731470f..883d046 100644 --- a/pillar.example +++ b/pillar.example @@ -4,7 +4,7 @@ mysql: port: 3306 user: mysql - # Override any names defined in package-map.jinja + # Override any names defined in map.jinja lookup: server: mysql-server client: mysql-client