Commit Graph

22 Commits

Author SHA1 Message Date
Brett Mack
6ca1dbd65c Don't split multiline values into a list if wrapped inside "
Use salt.utils.dictupdate to merge dictionaries
2015-06-12 03:46:28 +01:00
Brett Mack
1bbaf0e9a0 More style guideline fixes 2015-06-12 03:46:28 +01:00
Brett Mack
2ce52ee95f Style changes to bring code in line with coding standards 2015-06-12 03:46:28 +01:00
Brett Mack
fed5ce8e4b Use consul as an external pillar source. Requires python-consul 2015-06-12 03:46:28 +01:00
Aneesh Agrawal
ac4792f68d Add a SQLite3 ext_pillar built on the sql_base pillar. 2015-05-27 14:45:33 -04:00
Aneesh Agrawal
decb6cef97 Extract PEP 249 compliant sql_base ext_pillar from MySQL.
Refactor the mysql ext_pillar so all PEP 249 generic code is in
sql_base to allow for easy addition of new ext_pillars.
2015-05-27 14:45:33 -04:00
Mike Place
bb49244c37 Fix test 2015-04-22 16:28:09 -06:00
jfindlay
8e4bf33404 Merge pull request #21930 from ptonelli/develop
add hg_pillar similar to git_pillar
2015-03-24 13:10:53 -06:00
Paul Tonelli
15f66d1f0f fix hg_pillar unittest lint errors 2015-03-24 15:52:13 +01:00
Georges Racinet
458cc64886 Pylint error + standalone launcher 2015-03-16 18:13:52 +01:00
Georges Racinet
2901c98119 git_test: credits 2015-03-15 19:07:34 +01:00
Georges Racinet
0dae9dfa5d Tests for git_pillar
Two different calls of the `ext_pillar` entry function are checked, a
direct one and one from upper in the calling stack (more integration)
The different options show the slight differences (almost side effects
between them).

A third test is included to detect infinite recursions, to avoid future
refactors that could bring them back accidentally.
2015-03-15 18:50:57 +01:00
Paul Tonelli
ca4061b5b8 add hg_pillar and corresponding unit test 2015-03-04 19:00:23 +01:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
9303e48f4b Change mysql pillar test to use updated class name 2014-12-24 11:19:22 -07:00
rallytime
b579247646 Add no_mock/_reason and ensure_in_syspath 2014-08-12 16:48:01 -06:00
rallytime
a0233b3ebf Fix pillar mysql test formatting 2014-08-12 16:44:33 -06:00
Pedro Algarvio
ea8db1e427 Allow standalone test execution 2014-03-31 03:05:05 +01:00
Thomas S Hatch
67205e2106 whitespace 2014-02-14 16:34:03 -07:00
rallytime
647122cc55 lint fixes 2014-02-14 13:44:36 -07:00
Daniel Bradshaw
95e32ec52b Support for coercing dicts to lists.
Specify fields to be hit with dict.values()
2014-02-06 05:14:52 +00:00
Kaithar
41714c3adb Test cases 2014-02-06 05:14:52 +00:00