Commit Graph

69558 Commits

Author SHA1 Message Date
Nicole Thomas
7aefc80006 Make sure new csf module docs are included in build (#33126) 2016-05-09 12:48:15 -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
Loren Gordon
f354f68b64 Join domain with new name (#32988)
This patch will use a new, "pending" computer name when joining a
Windows system to an Active Directory domain. This allows a user
to rename a computer, then join a domain, and the new computer
name will be used for the computer account. Without this patch,
the old computer name would be used for the domain computer account.

This flag has been tested to work even if the computer name is not
changing.

See https://msdn.microsoft.com/en-us/library/windows/desktop/aa370433(v=vs.85).aspx.
2016-05-09 10:51:11 -07:00
Shubham Jain
b774daf313 Fix functionality of unless in states.cmd, when unless condition given as a list (#33026) 2016-05-09 10:50:00 -07:00
Robin
5a9260734f Fix override of ec2 volumetype (#33115)
* Fix override of ec2 volumetype

* Fixed the fix for ec2 volumetype override
2016-05-09 10:45:15 -07:00
rallytime
bfaf5409e6 Pylint 2016-05-09 11:43:03 -06:00
rallytime
f2dec459d8 Take the develop version of glusterfs.py state 2016-05-09 11:17:46 -06:00
Thomas S Hatch
386143a7f7 Add a check that the cmdline of the found proc matches (#33101) 2016-05-09 10:17:37 -07:00
Mircea Ulinic
8d95d8291d Changed NAPALM output (#33095) 2016-05-09 10:14:22 -07:00
Jεan Sacren
479e643b62 Develop 2016 0509 0030 (#33111)
* Disallow negative value for fib number

Fibonacci number is supposed to be nonnegative. Add this new feature to
disallow negative value to be passed in for fib number.

* Minimize code duplication

* Use /etc/adjtime for Gentoo

* Add integration test for timezone module
2016-05-09 10:06:44 -07:00
Mike Place
3690598301 Remove poorly written test (#33124)
This tests nothing at all. Removing with extreme prejudice.
2016-05-09 10:06:18 -07:00
Mostafa Hussein
108107b36c Add Support for CSF (#33117) 2016-05-09 09:52:41 -07:00
Shane Lee
d45b599036 Fix 33058 (#33099)
* Fix servermanager module

- Added check for 2008 version of windows
- Added Import-Module ServerManager to _pshell_json.
  Apparently this needs to run each time we issue a
  servermanager command.

* Fix list_available
2016-05-09 09:45:11 -07:00
Colton Myers
8acc3147d6 Merge pull request #33106 from abednarik/abednarik_master_Finger_stacktrace
Moved _finger_fail method to parent class.
2016-05-09 10:31:09 -06:00
abednarik
91a69ba54a Moved _finger_fail method to parent class.
Method _finger_fail method from SAuth to AsyncAuth class to make method available
in both class and fix an issue where _finger_Fail is called inside AsyncAuth.
2016-05-07 11:34:15 -03: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
Megan Wilhite
20c7e10793 clarify docs that map is designed to be run once. is not stateful (#33102) 2016-05-06 15:53:31 -06:00
Nicole Thomas
558561d86f cloud.query needs to define mapper.opts (#33098) 2016-05-06 14:17:34 -06:00
Nicole Thomas
c1f7aed8a5 Merge pull request #33096 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-06 13:27:57 -06:00
rallytime
0fd5e9d157 Merge branch '2015.5' into '2015.8'
Conflits:
  - salt/minion.py
  - tests/integration/states/file.py
2016-05-06 12:04:06 -06:00
Nicole Thomas
aed7bed42e Merge pull request #33094 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-06 10:20:21 -06:00
Shane Lee
2dc45dc97e verify_env function for windows (#33062)
* Create win_functions utility

- Create win_verify_env to create directories for windows minion
  and master. Uses functions from win_functions
- Fix stacktrace when minion starts when there's already a minion
  running. os.getppid doesn't work in windows. Created a function
  in win_functions to duplicate that functionality.

* Fix permissions for PKI dir

* Fix some lint issues

* Fix one more lint item

* Fix win_verify_env for tests

* Fix duplicate import, incorrect virtual name

* Fix permissions
2016-05-06 08:28:55 -07:00
skizunov
3d66d18266 PY3: Fix dict keys when using salt.filesystem.FSChan (#33077)
salt/fileclient.py:
- For `RemoteClient.get_file`, sometimes `self.channel` is
a `salt.filesystem.FSChan` object. When this is the case, it is
not getting the data from a remote system, so the returned dict
keys are already string objects (as opposed to when getting them
remotely, the dict keys are bytes objects due to raw mode). To
account for this, convert all the top-level keys in the returned
dict to strings so that the logic may correctly process them.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-05-06 08:28:29 -07:00
Mike Place
30edeadafd Lower display of msgpack failure msg to debug (#33078)
Closes #33074
2016-05-06 08:28:14 -07: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
Justin Anderson
d4928c5a22 Use saltstack repo in buildpackage.py on CentOS 5 (#33080) 2016-05-06 08:27:31 -07:00
idonin
22a327bc0b salt-cloud: fix ipv6-only virtual machines (#32865)
* salt-cloud: fix ipv6-only virtual machines

* fix hostname for rsync fallback in scp_file function

* use 4 spaces instead of 2

* remove global variable, use direct socket call instead
2016-05-06 09:25:57 -06:00
Justin Findlay
e788f7ec44 modules.npm: do not log npm --version at info level (#33084) 2016-05-06 08:22:20 -07:00
Mike Place
44675c1828 Merge pull request #33086 from yobo000/develop
Fix typo
2016-05-06 08:21:31 -07:00
rallytime
180c03ca24 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/states/boto_elb.py
  - tests/integration/states/user.py
  - tests/unit/states/file_test.py
2016-05-06 09:20:05 -06:00
Mike Place
3808d05838 Merge pull request #33081 from jfindlay/ssh_doc
ssh docs: install py-2.6 for RHEL 5
2016-05-06 08:18:39 -07:00
Mike Place
6d604926d3 Merge pull request #33088 from isbm/isbm-zypper-fix-booleans
Bugfix: Restore boolean values from the repo configuration
2016-05-06 08:13:27 -07:00
Megan Wilhite
2c6326f14a fix tests for file.blockplace to remove newline (#33082) 2016-05-06 08:44:20 -06:00
Bo Maryniuk
3ca203eb8e Bugfix (follow-up): setting priority requires non-positive integer 2016-05-06 13:27:55 +02:00
Bo Maryniuk
79a46e091c Add repo config test 2016-05-06 12:57:52 +02:00
Bo Maryniuk
222b8369ca Add test data for repos 2016-05-06 12:57:36 +02:00
Bo Maryniuk
b746fa35f0 Bugfix: Restore boolean values from the repo configuration 2016-05-06 12:29:48 +02:00
yobo
1e11c2dd9e Fix typo
Fix the typo ect->etc。
2016-05-06 14:48:16 +08:00
Mike Place
bea1e2661d Merge pull request #32904 from dmurphy18/automate_signing
Automate signing
2016-05-05 17:37:53 -07:00
Justin Findlay
a2c927b173 ssh docs: install py-2.6 for RHEL 5 2016-05-05 16:16:54 -06:00
Chandler
fececb5663 Delete extra space (#33072) 2016-05-05 11:11:33 -06:00
Mike Place
200af076db Catch IOLoop RuntimeError on CLI exit (#33070)
Closes 32899

Fises
2016-05-05 10:31:09 -06:00
David Murphy
ab61a37324 Disable pylint warning for unused imports 2016-05-05 10:00:47 -06:00
Mike Place
0ebeb587a9 Merge pull request #32677 from gladiatr72/utils.boto__populate_salt_dunder__fix_region_arg_getting_stomped
It doesn't seem like there was a populated salt dunder within the
2016-05-05 07:45:09 -07:00
Mike Place
6b57ce390f Merge pull request #32803 from jpeach/trafficserver-use-traffic-ctl
Use traffic_ctl in the trafficserver state and module.
2016-05-05 07:39:26 -07:00
Mike Place
fb89877cf2 Merge pull request #32892 from isbm/isbm-zypper-env-variables
Resolve Zypper locks on asynchronous calls
2016-05-05 07:34:59 -07:00
Andrew Hammond
dd20299087 Refactor ipset tests (#32973)
* remove spurious return

* refactor state.ipset tests

* ipset comments: consistency and correct english

* trim out broken code
2016-05-05 07:31:49 -07:00
Aditya Kulkarni
df6296e3ce Replace args and kwargs (plural) by arg and kwarg (singular) for `RunnerClient` (#32938)
* Replace args and kwargs (plural) by arg and kwarg (singular)

* Add test and deprecation warning

* Add deprecation warning
2016-05-05 07:31:08 -07:00
Kevin Quinn
581f9d328a Fix 'present' option when used without 'key_type' (#32965) 2016-05-05 07:27:30 -07:00