Commit Graph

618 Commits

Author SHA1 Message Date
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408)
* Fix master hanging after a request from minion with removed key. (#33333)

* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* remove redundant, incorrect sudo_runas config documentation (#33318)

* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* Add docs for mine_functions config var (#33326)

* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.

* Bp 28467 calm mine (#33327)

* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* Expanded documentation for boto_elb state and module (#33341)

* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.

* Properly detect newer Linux Mint distros (#33359)

* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.

* Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)

* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 13:48:40 -07:00
rallytime
c8b8d82745 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/proxy/junos.py
2016-05-16 12:32:23 -06:00
Shane Lee
4c51d31cae Fix salt-config script for mac install (#33250) 2016-05-15 13:08:10 -07:00
Nicole Thomas
b6cf601722 Merge pull request #33103 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-05-09 13:24:25 -06:00
plastikos
0efbbcd17f * Improve init script: specifically manage salt configurations rather than arbitrary salt processes (#32666)
* * Improve init script: specifically manage salt configurations rather than arbitrary salt processes

Unfortunately SysV init scripts tend to rummage through PIDs filtering for
appropriate processes to manage.  Unfortunately the filters are usually weak
and don't account for similar processes run by other users, PIDs of dead
processes being re-used for completely different executables, etc..  These
weaknesses can result in killing unrelated processes with potentially serious
results.

These improvements to the SysV init script is a complete rewrite with the
following improvements:

  * Specifically manage individual salt configurations rather than looking for
    salt minion-like processes.
  * Obtain salt minion information from the salt configuration - use the
    information to manage the specifically configured process.
  * Drop all of the platform-specific helper functions that allow the
    previously-mentioned weaknesses.

    + Unfortunately this means that the output information may not match the
      specific platform (this could easily be corrected).

  * Now can manage multiple salt processes started by different users

    + Unfortunately starts/stops/restarts as a group and is unable to manage
      them both as a group or as individual processes (this could easily be
      corrected)

The new initscript also allows various control variables to be overridden by
environment variables or through settings put in ``/etc/sysconf/salt`` or
``/etc/default/salt``.

:SALTMINION_DEBUG: Dump each line expansion before execution, output system
                   information on failure.  Default: unset

:SALTMINION_BINDIR: Location of ``salt-minion``, ``salt-call`` and other
                    executables.  Default: ``/usr/bin``

:SALTMINION_SYSCONFDIR: The parent directory for the ``salt`` configuration
                        directory and the ``sysconfig`` or ``default``
                        directory.

* Add lines that went missing in the rebase+squash
2016-05-09 10:57:13 -07:00
rallytime
ced033c0a4 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2016.3.0.rst
  - salt/scripts.py
  - salt/states/glusterfs.py
2016-05-06 16:05:58 -06:00
Shane Lee
f61cf6929a Add PyYAML with CLoader (#33079)
- Check for python before installing
- Update other dependencies to the latest
2016-05-06 08:28:03 -07:00
rallytime
16c9ce70ad Merge branch '2016.3' into 'develop'
No conflicts.
2016-05-02 12:58:24 -06:00
Shane Lee
ae32f17b82 Add salt-config script to Mac Installer (#32873)
* Add script to configure salt

* Add salt-config.sh to installer scripts

* Add additional information to welcome/conclusion

* Fix text in conclusion

* Make salt-config.sh executable

* Create symlink to salt-config.sh

* Create minion.d directory

* Fix changed comparison to determine restart

* Add -f option to symlink creation
2016-04-29 11:01:20 -07:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
2016-04-28 15:35:34 -06:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903)
* Remove _get_date_time_format function

* Fix incorrect timelib version
2016-04-28 10:06:44 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
Shane Lee
25df973d4c Added pycurl to windows dependencies (#32731) 2016-04-25 11:13:10 -06:00
Shane Lee
8de1c6c094 Add debugging options to mac service configs (#32789) 2016-04-25 11:06:30 -06:00
Shane Lee
c657f3d829 Remove additional unneeded files and dirs (#32790) 2016-04-25 09:23:47 -06:00
Shane Lee
13f18beefc Add license information for pip modules (#32738)
* Adds readme file for license information

* Add special requirements modules
2016-04-21 08:12:04 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
Jeremy McMillan
e25281fd20 Issue32626 macports Portfile upgrade to 2015.8.8.2 (#32629)
* This is the 2015.8.5 Portfile distributed by MacPorts

* version to 2015.8.8.2 and use osx pkg LaunchDaemon.plist resources for master, api, syndic
2016-04-16 11:35:07 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
  - salt/states/user.py
2016-04-15 13:58:50 -06:00
Shane Lee
d12a1c2b8d Fix binary search and replace (#32542) 2016-04-13 10:15:02 -06:00
rallytime
093d833ff1 Merge branch '2016.3' into 'develop'
Conflicts:
  - pkg/osx/build.sh
2016-04-05 15:38:58 -06:00
Erik Johnson
764af33faf Add salt.bash symlink 2016-04-04 16:53:56 -05:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
twangboy
2e065e4a20 Fix documentation
Fix conflicts with parameters and default paths
2016-03-31 15:32:32 -06:00
twangboy
de4d66cdbf Fix build scripts for mac
Swap the order of the version and the temp dir parameters
Remove extra blank lines
Removed sourcing of additional scripts, use sudo
Additional Commenting
Fix typo (Evn vs Env)
Add check for Full XCode, errors if not installed
Add -L to curl command to handle redirects
Sudo -H for all sudo commands
Remove unnecessary symbolic link creation
2016-03-31 15:24:30 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 13:38:38 -06:00
twangboy
b7fcae97ce Create minion.d directory, fixes #31976 2016-03-29 14:17:24 -06:00
twangboy
6984d5a075 Update pip and setuptools using req-pip.txt 2016-03-28 18:39:24 -06:00
twangboy
94354c45de Fix upgrade pip 2016-03-28 18:27:36 -06:00
twangboy
733ef7c3e0 Make VC Compiler for Python install silently 2016-03-28 18:23:26 -06:00
twangboy
33735ada22 Fix VC for Python install 2016-03-28 18:21:58 -06:00
twangboy
2f957409ad Add timelib and prereqs for compiling
Add timelib==0.2.4 to req.txt
Add check for VC Compiler for python
Add installer for VC Compiler
2016-03-28 18:15:00 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
twangboy
a0edabf210 Add /opt/salt/bin to PATH
uses files under paths.d
also removed legacy launchctl load command
2016-03-25 16:14:40 -06:00
twangboy
61a91175a9 Add /opt/salt/bin to path 2016-03-25 15:43:28 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
Justin Findlay
8de84b4251 update suse master service patch
Fixes #780.
2016-03-23 16:03:12 -06:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
Christian McHugh
4000e68356 Create salt-proxy instantiated service file
Add a systemd service file for salt-proxy. 

Instantiate a new proxy service with proxyid=p8000:
# systemctl enable salt-proxy\@p8000.service
# systemctl start salt-proxy\@p8000.service
2016-03-10 13:25:01 -06:00
rallytime
7476076ea3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/beacons/memusage.py
2016-03-07 14:13:14 -07:00
Jorge Schrauwen
8077fe3e19 drop M2Crypto from the SmartOS esky builds 2016-03-05 23:43:18 +00:00
Mike Place
8664d1201a Merge pull request #31636 from nshalman/pkg-osx
pkg/osx: build_pkg.sh needs to be called not sourced
2016-03-03 09:13:11 -07:00
Nahum Shalman
08a2863676 pkg/osx: build_pkg.sh needs to be called not sourced
If it's sourced it ignores the command line arguments
and that makes it fail.
2016-03-02 16:01:20 -05:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
twangboy
1f6a95694d Grant permissions using SID instead of name 2016-02-29 18:09:31 -07:00