valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,483 Commits 24 Branches 182 Tags 341 MiB
7576193b4b
Commit Graph

56483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
7576193b4b Merge pull request #26235 from sjorge/smartos-utils-helper 
salt.utils.is_smartos_zone, inverse of is_smartos_globalzone
 2015-08-12 08:27:15 -06:00
Jorge Schrauwen
483de86df5 salt.utils.is_smartos_zone, inverse of is_smartos_globalzone, inversint it with not could give errorous results. 2015-08-12 07:14:30 +00:00
Mike Place
1492a14ea5 Merge pull request #26221 from sjorge/smartos-grains 
SmartOS grain fixes
 2015-08-11 15:45:14 -06:00
Jorge Schrauwen
22acfa1320 fix ip adres issues on SunOS/SmartOS 2015-08-11 20:59:19 +00:00
Mike Place
8e992f23d0 Merge pull request #26218 from terminalmage/issue4699 
Add warning about file.recurse unicode errors with vim swap files.
 2015-08-11 14:21:08 -06:00
Erik Johnson
9c155e0c1a Add warning about file.recurse unicode errors with vim swap files. 
Fixes #4699.
 2015-08-11 15:16:44 -05:00
Jorge Schrauwen
06df3ef7c1 SunOS should use isainfo to figureout osarch. 
Info from isainfo manpage
       -k
             Prints the name of the instruction set(s) used by the
operating
             system kernel components such as device drivers and STREAMS
             modules.
 2015-08-11 18:36:11 +00:00
Justin Findlay
d69f50e848 Merge pull request #26214 from rallytime/bp-24878 
Back-port #24878 to 2015.8
 2015-08-11 12:27:59 -06:00
Jorge Schrauwen
749cc419ec Just skip the smbios stuff on SmartOS regardless, even if smbios works 
in the global zone, it is not compatible!

Usage: smbios [-BeOsx] [-i id] [-t type] [-w file] [file]

        -B disable header validation for broken BIOSes
        -e display SMBIOS entry point information
        -i display only the specified structure
        -O display obsolete structure types
        -s display only a summary of structure identifiers and types
        -t display only the specified structure type
        -w write the raw data to the specified file
        -x display raw data for structures
 2015-08-11 18:23:30 +00:00
Jorge Schrauwen
ccd400a2f6 skip smbios grains on SmartOS when inside a zone 2015-08-11 18:14:17 +00:00
Jorge Schrauwen
cf74e49fca tweak smartos release info 2015-08-11 17:49:34 +00:00
Seth House
4471c3f237 Add note about top-file only env assignment and the show_top() function 2015-08-11 11:29:33 -06:00
Seth House
5864111429 Minor spelling, style fixes 2015-08-11 11:29:25 -06:00
Mike Place
8ad37e0558 Remove debugger 2015-08-11 11:29:19 -06:00
Mike Place
05c21297de Fix env ordering in merged list 2015-08-11 11:29:13 -06:00
Mike Place
a5522f1581 Removed incorrect default config 2015-08-11 11:29:06 -06:00
Mike Place
8ca0e59891 Lint 2015-08-11 11:28:59 -06:00
Mike Place
845d26f45e Add top_file_merging_strategy to mopts 2015-08-11 11:28:54 -06:00
Mike Place
c76084a960 Compare against client_env if that resolves 2015-08-11 11:28:47 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Mike Place
1c31722b49 Merge pull request #26211 from techhat/movespm 
Move SPM to its own directory
 2015-08-11 11:23:59 -06:00
Joseph Hall
176fa12d51 Move SPM to its own directory 2015-08-11 10:24:55 -06:00
Erik Johnson
8edc0d82c6 Merge pull request #26197 from TronPaul/gitfs-whitelist-base-fix 
Fix GitFS when whitelisting base
 2015-08-11 11:06:09 -05:00
Mike Place
b996cf41b1 Merge pull request #26200 from alprs/fix-salt_cloud_current_user 
Make it possible to run salt-cloud as current user
 2015-08-11 09:01:44 -06:00
Mike Place
82caf52497 Merge pull request #26201 from kev009/fbsd-disks-fix 
Avoid VBOX storage emulation bugs in FreeBSD disks grain
 2015-08-11 08:40:35 -06:00
Kevin Bowling
ded9f78ec0 Cache the VBOX check so we don't have to spawn another camcontrol for each disk 2015-08-11 01:50:19 -07:00
Kevin Bowling
2a24f8b768 Avoid VBOX storage emulation bugs in FreeBSD disks grain 2015-08-11 01:42:03 -07:00
Andreas Lutro
0f985e9883 salt-cloud: None means run as current user 2015-08-11 09:33:23 +02:00
Justin Findlay
7e58ee88dc Merge pull request #26188 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-10 22:17:59 -06:00
Mark McGuire
f3c1965785 Fix GitFS when whitelisting base 
- deconflate ref and env in every implementation of GitFS get_tree
 2015-08-10 22:47:30 -05:00
Mike Place
b72207f1c6 Merge pull request #26194 from basepi/fix.virt.grain.26121 
Allow virtual grains to be generated even if virt-what is not available
 2015-08-10 18:47:59 -06:00
Colton Myers
ed74766070 Allow virtual grains to be generated even if virt-what is not available 
Also normalized _cmds to be a list. The set() functionality wasn't
actually being used, we were just overwriting it with a list. Sets are
also unordered, which is a problem for a list of commands we want to run
in order.

Fixes #26121
 2015-08-10 17:17:59 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Colton Myers
49cfd3d54e Remove out of date code 2015-08-10 15:24:55 -06:00
Colton Myers
cccad1fc27 py3 compat 2015-08-10 15:22:43 -06:00
Colton Myers
aa19e20d43 Remove code that shouldn't have merged forward 2015-08-10 13:23:25 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
b76af36d38 Merge pull request #26176 from rallytime/bp-26165 
Back-port #26165 to 2015.8
 2015-08-10 12:22:20 -06:00
Nicole Thomas
ef5a4a47f6 Merge pull request #26172 from nmadhok/backport-cloud-fix-26163-2015.5 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:42:50 -06:00
Nitin Madhok
a51c4ac945 image argument not mandatory for vmware cloud driver. Fixes #26164 2015-08-10 10:35:33 -06:00
Mike Place
a547eaf672 Merge pull request #26169 from terminalmage/issue26149 
Fix attribute error in gitfs' find_file functions
 2015-08-10 10:34:12 -06:00
Nicole Thomas
151acabdca Merge pull request #26170 from nmadhok/backport-cloud-fix-26163-2015.8 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:25:03 -06:00
Nicole Thomas
22705c5222 Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8 
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
 2015-08-10 10:17:59 -06:00
Nicole Thomas
883bd060f7 Merge pull request #26173 from jacobhammons/cloud-driver-docs 
Updates to cloud docs for the provider > driver change
 2015-08-10 10:15:44 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Nitin Madhok
0f2b5f8ac8 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:14:18 -04:00
Erik Johnson
2bef1db9f5 Fix attribute error in gitfs' find_file functions 
Resolves #26149, thanks very much to @TronPaul for the investigative
work here.
 2015-08-10 10:07:55 -05:00
Nitin Madhok
cd4faace82 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:06:34 -04:00
Mike Place
2545df052a Merge pull request #26168 from cachedout/fix_slack_docs 
Fix slack docs
 2015-08-10 08:57:18 -06:00
Mike Place
f421a936dc Fix slack docs 
Closes #26098
 2015-08-10 08:56:42 -06:00