Permalink
Commits on Sep 30, 2016
  1. Merge pull request #36704 from daemonkeeper/develop

    Make the Salt Proxy environment aware
    cro committed on GitHub Sep 30, 2016
  2. Merge pull request #36710 from cachedout/yaml_test

    Workaround for interference between loader test and yaml test
    cachedout committed on GitHub Sep 30, 2016
  3. Workaround for interference between loader test and yaml test

    cachedout committed Sep 30, 2016
  4. Merge pull request #36705 from mrueg/timezone

    timezone: Don't assume /etc/timezone exists
    cachedout committed on GitHub Sep 30, 2016
  5. Merge pull request #36647 from MTecknology/develop

    Documentation Updates: reactor/orchestrator/git_fileserver
    cachedout committed on GitHub Sep 30, 2016
  6. Merge pull request #36639 from skizunov/develop2

    Port the 'rabbitmq' module to Windows
    cachedout committed on GitHub Sep 30, 2016
  7. timezone: Don't assume /etc/timezone exists

    Sometimes /etc/timezone might not exist
    mrueg committed with Manuel Rüger Sep 30, 2016
  8. Make the Salt Proxy environment aware

    The Salt proxy minion is looking for proxy minion modules in
    salt://_proxy/. It does so however only in the default "base"
    environment. On setups which do not use "base" or shall be executed in a
    different environment this breaks:
    
    /etc/salt/master:
    ...
    file_roots:
      noc:
        - /srv/salt
    ...
    
    $ grep "proxyenabled" /srv/salt/_proxy/junos_manager.py
    __proxyenabled__ = ['junos_manager']
    
    $ salt-proxy --proxyid=dev1 -l debug
    ...
    DEBUG   ] rest_sample proxy __virtual__() called...
    [INFO    ] ssh_sample proxy __virtual__() called...
    [DEBUG   ] Could not LazyLoad junos_manager.grains
    [DEBUG   ] Could not LazyLoad junos_manager.init
    [ERROR   ] Proxymodule junos_manager is missing an init() or a
    shutdown() or both. Check your proxymodule.  Salt-proxy aborted.
    [WARNING ] Stopping the Salt Proxy Minion
    [ERROR   ] -1
    [INFO    ] The proxy minion is shutting down..
    [INFO    ] The Salt ProxyMinion is shut down
    
    This is because the loader only looks for _proxy modules in the "base"
    environment. This commit fixes this (but might possibly break other
    things, though I did not find side-effects)
    Arno Toell committed Sep 30, 2016
Commits on Sep 29, 2016
  1. Merge pull request #36685 from rallytime/merge-develop

    [develop] Merge forward from carbon to develop
    rallytime committed on GitHub Sep 29, 2016
  2. Updated rabbitmq module unit test

    Updated to track changes to the rabbitmq module for the Windows
    port.
    
    Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
    skizunov committed Sep 29, 2016
  3. Merge branch 'carbon' into 'develop'

    Conflicts:
      - salt/states/file.py
    rallytime committed Sep 29, 2016
  4. Port the 'rabbitmq' module to Windows

    The following changes are necessary for the port:
    - On Windows, `rabbitmqctl.bat` and `rabbitmq-plugins.bat` are not found
    in a system path. Created an algorithm to find the correct path to these
    files which is run in `__virtual__()` and the result is saved in
    `__context__`.
    - Windows `runas` currently requires a password. Due to this, don't use a
    default value if `runas` is initially set to `None` in Windows.
    - Switched from `cmd.run` to `cmd.run_all` because many errors don't
    contain the word 'Error' in the output. So we check both the return value
    and if `stderr` is not empty (on Windows the return value is 0 even on
    some errors because it is calling a batch file `rabbitmqctl.bat` which
    doesn't properly propogate error codes).
    - Created a `_check_response()` function to facilitate this type of error
    checking in functions that don't call `_output_to_dict()` or
    `_format_response()` (these two functions have also been updated for this
    type of error checking).
    - On Windows, `cmd.run` and `cmd.run_all` in non-shell mode do not
    properly propogate a password that contains a special character such as
    '|' to `rabbitmqctl.bat`. Work around this by using shell mode and
    quoting. More details in the code comments.
    
    Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
    skizunov committed Sep 27, 2016
  5. Reworking wording in the last line and some whitespace

    MTecknology committed Sep 29, 2016
  6. Merge pull request #36293 from isbm/isbm-thin-modules-config

    Configure thin/min modules permanently
    cachedout committed on GitHub Sep 29, 2016
  7. Merge pull request #36630 from roscoecairney/add-feature-junos-instal…

    …l-config-with-templating
    
    Add a kwarg to let people switch on templating for Junos config files
    cachedout committed on GitHub Sep 29, 2016
  8. Merge pull request #36640 from rallytime/bp-36552

    Back-port #36552 to carbon
    cachedout committed on GitHub Sep 29, 2016
  9. Merge pull request #36655 from terminalmage/fix-check_avail

    Fix traceback when checking command whitelist/blacklist
    cachedout committed on GitHub Sep 29, 2016
  10. Merge pull request #36651 from jfindlay/child_cmdline

    tests.integration.__init__: except psutil error
    cachedout committed on GitHub Sep 29, 2016
  11. Merge pull request #36657 from StreetHawkInc/msazure_list_input_endpo…

    …ints
    
    Salt cloud msazure 'Role' is a list, fixes #36063
    cachedout committed on GitHub Sep 29, 2016
  12. Role is a list, fixes #36063

    Steven Joseph committed Sep 29, 2016
  13. Fix traceback when checking command whitelist/blacklist

    When pub kwargs are passed to a cmd.run* function, we invoke
    _check_avail() to examine the command to see if it matches the
    whitelist/blacklist expression(s). To perform the fnmatch, we join the
    list of arguments into a string. When one of the arguments is, for
    instance an int, this causes a traceback.
    
    This fixes that traceback by forcing non-string arguments to be strings
    in the call to ``str.join()``, converting non-string arguments to
    strings. This selective conversion to a str preserves elements of the
    list that may contain unicode characters from being converted to the
    ``str`` type in Python 2.
    terminalmage committed Sep 29, 2016
Commits on Sep 28, 2016
  1. tests.integration.__init__: except psutil error

    Related to d0f44c9.
    jfindlay committed Sep 28, 2016
  2. Missed that the correct link gets created; yay sphinxdoc

    MTecknology committed Sep 28, 2016
  3. Adding quotes to help identify this is a document title; would link i…

    …f this was not a man page
    MTecknology committed Sep 28, 2016
  4. a small, and unfortunate error (#36643)

    roosri committed with rallytime Sep 28, 2016
  5. Update index.rst

    MTecknology committed on GitHub Sep 28, 2016
  6. Copying block about storing SLS files

    MTecknology committed on GitHub Sep 28, 2016
  7. Trivial orchestrate doc changes

    The overstate system seems to have been fully removed; updating to reflect this change
    MTecknology committed on GitHub Sep 28, 2016
  8. Merge pull request #36623 from rallytime/merge-carbon

    [carbon] Merge forward from 2016.3 to carbon
    rallytime committed on GitHub Sep 28, 2016
  9. archive.extracted: Use `user`/`group`, not `archive_user`

    Ensure that any created parent directories are made with `user`/`group`
    perms, not as the `archive_user` user. This also allows setting the
    group for these dirs instead of defaulting to `root`.
    
    The `archive_user` argument to archive.extracted has been deprecated
    since version 2014.7.2, and supplanted by the `user` parameter in
    2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
    complete the deprecation by:
    - no longer silently using `archive_user` in `archive.extracted`,
      preferring instead `user` and `group`,
    - no longer accepted `archive_user` as an argument.
    
    Also update man page.
    aneeshusa committed with rallytime Sep 24, 2016
  10. Merge pull request #36323 from cachedout/git_pillar_exception_handling

    Handle lack of exception class in older git backends
    terminalmage committed on GitHub Sep 28, 2016
  11. Better merge conflict fix: pass **params to consul.Consul in

    consul_pillar.py
    rallytime committed Sep 28, 2016
  12. Add consul host, port, and token values back in with conf.get()

    rallytime committed Sep 28, 2016
  13. Merge pull request #36628 from yhekma/develop

    Update doc to reflect the version where 'none' was added as a pillar_…
    cachedout committed on GitHub Sep 28, 2016