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
8da27c9e1d
Merge pull request #40306 from terminalmage/issue40279
...
Don't use context caching for gathering systemd services
2017-04-04 14:36:38 -06: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
87ef7732b3
Merge pull request #40423 from akelge/develop
...
Quick patch to support SAN addition/removal
2017-04-04 14:15:43 -06:00
Mike Place
7e72adf774
Remove dead code
2017-04-04 14:15:32 -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
97caac4c0a
Merge pull request #40481 from terminalmage/docker-auth-handling-2016.3
...
Backport auth and custom registry fixes from #40480 to 2016.3 branch
2017-04-04 14:09:25 -06:00
David Murphy
fd93caf206
Added further support for functionality on AIX for 2016.11.4
2017-04-04 13:57:37 -06:00
Mike Place
93b1afd551
Merge pull request #40493 from Mapel88/develop
...
fix "set_webapp_settings"
2017-04-04 13:56:51 -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
David Murphy
17b58917f2
Update release information for new AIX support
2017-04-04 13:51:14 -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
ad640e5c46
Merge pull request #40509 from thatch45/saltwinshell
...
Framework in place for salt-ssh to windows
2017-04-04 13:38:40 -06:00
Mike Place
fe9bc95b26
Merge pull request #40513 from terminalmage/fileserver-design-docs
...
Add initial developer docs on the fileserver and client
2017-04-04 13:37:35 -06:00
Mike Place
b06bf00101
Merge pull request #40516 from q1x/develop
...
Mediatype support for Zabbix execution module
2017-04-04 13:35:15 -06:00
Mike Place
778c1c94bd
Merge pull request #40522 from carlpett/vault-fix-master-minion
...
Salt-vault: Fix handling of None-grains
2017-04-04 13:33:56 -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
Pedro Algarvio
c3417213d7
Make sure the socket's used are closed
2017-04-04 19:28:06 +01:00
Erik Johnson
906d02f395
Add a section on updating the fileserver
2017-04-04 13:06:45 -05:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root.
2017-04-04 18:58:21 +01:00
Pedro Algarvio
dcf0a55daf
Use the test run temporary path, not the system temporary path
2017-04-04 18:58:21 +01:00
Pedro Algarvio
9bbfd6605c
Fix state files temporary path
2017-04-04 18:58:21 +01:00
Pedro Algarvio
de9ccbdb43
Fix mocked test
2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests
2017-04-04 18:58:20 +01:00
Pedro Algarvio
e6f43b46c0
Import from the original modules
2017-04-04 18:58:20 +01:00
Pedro Algarvio
42e35e13cc
Use mock to patch
2017-04-04 18:58:20 +01:00
Pedro Algarvio
86536e64c5
Make sure files are closed
2017-04-04 18:58:20 +01:00
Pedro Algarvio
008f0016e2
Make sure we close the spooled temporary file
2017-04-04 18:58:19 +01:00
Pedro Algarvio
5dfe43fc2e
First resource leakage fix pass
2017-04-04 18:58:19 +01:00
Pedro Algarvio
ed42624025
PY3 compat
2017-04-04 18:58:19 +01:00
Pedro Algarvio
4a43d00d80
Proper mocking
2017-04-04 18:58:19 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration
2017-04-04 18:58:19 +01:00
David Murphy
712537272b
Added support on AIX for disk.iostat
2017-04-04 11:35:09 -06:00
Nicole Thomas
518973f1c1
[Lint] Fix spaces around variable assignment
2017-04-04 11:26:33 -06:00
zer0def
3c750c2b24
Changed rm_rf's argument to actually remove intended file. (refs #31363 )
2017-04-04 19:23:26 +02:00
