valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,677 Commits 24 Branches 182 Tags 341 MiB
73f4c43e2a
Commit Graph

76677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
78b4798b1b Update compile_template test to use StringIO 2017-04-04 15:41:43 -05:00
Erik Johnson
5f7c5613ce Properly handle renderers which return StringIO objects 2017-04-04 15:41:43 -05:00
Erik Johnson
d551b0d857 Bring in salt.utils.stringio from develop branch 2017-04-04 15:41:43 -05:00
Erik Johnson
6a6ef0adf8 Move userdata templating to salt.utils.cloud 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6183d93d3 Preserve windows newlines in salt.template.compile_template() 
Test included.
 2017-04-04 15:41:43 -05:00
Erik Johnson
04f02df5fe Try to read compiled template as StringIO 
The fact that PyYAML was the last renderer in the render pipe initially,
masked the fact that template renderers return StringIO instances and
not strings. This commit makes sure that we try reading from the
StringIO first and then fallback to just trying to base64 encode the
userdata value as returned by compile_template().
 2017-04-04 15:41:43 -05:00
Erik Johnson
79cc253bbf Only template the userdata_file if explicitly configured to do so 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
50f2b2831f Remove userdata_renderer value 2017-04-04 15:41:43 -05:00
Erik Johnson
cc2186f35a Add templating support for other cloud drivers that support userdata_file 2017-04-04 15:41:43 -05:00
Erik Johnson
be8d34c59b ec2: Add support for using userdata_renderer to template userdata_file 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
Erik Johnson
9ee2dcfc2d Add userdata_renderer master config param 2017-04-04 15:40:50 -05:00
Mike Place
4d932691f1 Merge pull request #40528 from dmurphy18/salt_nightlybuild 
Allow for nightly build designations in Salt versions
 2017-04-04 14:34:25 -06:00
Mike Place
0ed385210f Merge pull request #40465 from rallytime/fix-37699 
Artifactory Execution & State Module: Fixup Error Handling
 2017-04-04 14:12:21 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
Mike Place
d654de52ed Merge pull request #40504 from rallytime/fix-38683 
Group checks for failhard setting in () in state.check_failhard function
 2017-04-04 13:53:48 -06:00
Mike Place
4d5d7d9712 Merge pull request #40503 from thatch45/2016.11 
first pass at adding support for pycryptodome installed as
 2017-04-04 13:39:01 -06:00
Mike Place
0dd92c63ea Merge pull request #40525 from dmurphy18/aix_dskiostat 
Add support for disk.iostat on AIX
 2017-04-04 13:31:41 -06:00
David Murphy
d62a119fc1 Allow for nightly build designations in Salt versions 2017-04-04 12:59:06 -06:00
David Murphy
712537272b Added support on AIX for disk.iostat 2017-04-04 11:35:09 -06:00
Nicole Thomas
a6291b17c1 Merge pull request #40496 from rallytime/bp-40415 
Back-port #40415 to 2016.11
 2017-04-04 11:19:38 -06:00
Nicole Thomas
3eb8e0baf1 Merge pull request #40468 from techhat/cachealias 
Add __func_alias__ back in
 2017-04-04 11:02:42 -06:00
Thomas S Hatch
e21fd54d1b fix lint on the lint ignores... 2017-04-04 09:27:41 -06:00
Mike Place
8c0befaa8b Merge pull request #39109 from bdrung/fix-merge-order-warning 
Fix top_file_merging_strategy warning if env_order is set
 2017-04-04 08:20:55 -06:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
16e19ea860 Merge branch 'thatch45-rand_m_doc' into 2016.11 2017-04-04 00:27:15 -05:00
Thomas S Hatch
60113248b1 pycryptodome adds RSA to the key header which the openssl 
PEM decoder does not recognise
 2017-04-03 16:02:04 -06:00
Thomas S Hatch
206dec63ff fix the cryptodome version lookup for the versions report 2017-04-03 15:21:25 -06:00
Thomas S Hatch
d3b77092b5 good catch 2017-04-03 14:55:10 -06:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -06:00
rallytime
ede4c28887 Group checks for failhard setting in () in state.check_failhard function 
Fixes #38683

When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.

The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.

Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
 2017-04-03 14:41:54 -06:00
Thomas S Hatch
31c6a10d1b first pass at adding support for pycryptodome installed as 
pycryptodomex, this allows us to maintain compat with pycrypto being
installed on the system without introducing a module library dependency
 2017-04-03 14:40:44 -06:00
Joseph Hall
6ec0baa9a0 Swap around aliases 2017-04-03 13:58:51 -06:00
Joseph Hall
76e54a2900 Add __func_alias__ back in 2017-04-03 13:46:33 -06:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Nicole Thomas
02a1f642ab Merge pull request #40495 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-03 12:36:15 -06:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
Andrei Belov
f8b3006898 Fix boto_vpc.create_route() to work with interface_id 
Seems like it was broken in 4611a9c5 merge commit.
 2017-04-03 10:49:12 -06:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
 2017-04-03 10:41:01 -06:00
Pedro Algarvio
ac82972cb3 Merge pull request #40466 from dmurphy18/aix_status 
Support for execution module status on AIX
 2017-04-01 01:28:50 +01:00
rallytime
8f084f7056 Update unit test to look for actual string comment 2017-03-31 15:34:24 -06:00
Mike Place
fdb0250c95 Merge pull request #40429 from DSRCorporation/features/39275_memcache 
MemCache - a minion data cache booster.
 2017-03-31 14:20:59 -06:00
David Murphy
7c0b30d9a4 Support for AIX 2017-03-31 14:17:37 -06:00
Mike Place
31d4e6949c Merge pull request #40442 from gtmanfred/salt-ssh 
allow file_client to figure out cachedir
 2017-03-31 14:14:27 -06:00