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
92,038 Commits 24 Branches 182 Tags 341 MiB
fb0aedbff4
Commit Graph

92038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
denza
fb0aedbff4 Merge branch 'develop' of github.com:StackPointCloud/salt into public_private_ip 2018-03-21 22:43:01 +01:00
Nicole Thomas
f77f0efef7
Merge pull request #46522 from rallytime/state-deprecations 
Handle some of the state deprecations for Fluorine
 2018-03-20 16:15:54 -04:00
Nicole Thomas
4fab24c1a2
Merge pull request #46621 from DSRCorporation/bugs/sj881_ldap_test_fix 
Reverted PR#45859 breaking the test
 2018-03-20 16:07:53 -04:00
Nicole Thomas
12fd4980a1
Merge pull request #46544 from s0undt3ch/features/schedule-job-func 
Allow running the schedule jobs to run in the foreground.
 2018-03-20 13:42:03 -04:00
Dmitry Kuzmenko
778b315add
Reverted PR#45859 breaking the test 
Because I don't understand how that PR works at all.
I've opened discussion with the author I'll return it back in a proper
way after we'll figure out how it should work.
 2018-03-20 17:05:15 +03:00
Nicole Thomas
7036d57e7c
Merge pull request #46562 from bodhi-space/infra6667 
INFRA-6667 - avoid stack-trace in boto_asg module
 2018-03-20 09:43:26 -04:00
Nicole Thomas
de848c5fb9
Merge pull request #46582 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-20 09:30:40 -04:00
Nicole Thomas
a08753b750
Merge pull request #46575 from mbologna/patch-1 
Fix: decrease loglevel when unable to resolve addr
 2018-03-20 09:23:18 -04:00
Nicole Thomas
0e2e501b24
Merge pull request #46609 from garethgreenaway/46593_develop_schedule_present_always_triggers_change 
[develop] fixes to scheduler
 2018-03-20 09:20:19 -04:00
Nicole Thomas
a7c93fdd63
Merge branch 'develop' into state-deprecations 2018-03-20 09:18:53 -04:00
Nicole Thomas
f3d7f7d40d
Merge pull request #46586 from rallytime/fix-46468 
Handle the win_update and win_wua deprecations for Fluorine
 2018-03-20 09:17:28 -04:00
Nicole Thomas
927c5fbe43
Merge pull request #46614 from angeloudy/fix-broken-thing 
zabbix should use hostname instead of visible name to get host info
 2018-03-20 08:58:22 -04:00
angeloudy
0e643f9b02
Merge branch 'develop' into fix-broken-thing 2018-03-20 10:45:00 +11:00
angeloudy
b94b1bb9f6 zabbix should use hostname instead of visible name to get host info 2018-03-20 10:40:24 +11:00
Nicole Thomas
ec5241d58e
Merge pull request #46610 from rallytime/fix-46585-datj 
Fix typo in pillar docs
 2018-03-19 17:26:20 -04:00
rallytime
a7a1b293c7
Fix typo in pillar docs 
datj --> data

Fixes #46585
 2018-03-19 12:59:54 -04:00
Nicole Thomas
6a32d32ed7
Merge pull request #46585 from garethgreenaway/46558_fixing_utils_parsers_documentation 
[develop] fixing typos in utils/parsers.py
 2018-03-19 12:57:37 -04:00
Gareth J. Greenaway
5661357288
Fixing a bug that would result in constant changes using the schedule state module when a job was added with run_on_start. Adding an eval test to test run_on_start functionality. 2018-03-19 09:34:18 -07:00
Gareth J. Greenaway
03b2ba800c
requested changes 2018-03-19 08:10:48 -07:00
Gareth J. Greenaway
7df979eebd
Fixing typos in utils/parsers.py which end up in various documentation and man pages. 2018-03-19 08:10:48 -07:00
Nicole Thomas
fc60d48afc
Merge pull request #46590 from sdodsley/purefb_doc 
Add autodoc file for new purefb execution module
 2018-03-19 08:15:02 -04:00
Simon Dodsley
a64790c670 Add autodoc file for new purefb execution module 2018-03-16 21:02:00 -04:00
rallytime
0568474f57
Handle the win_update and win_wua deprecations for Fluorine 
The `win_update` execution and state modules were marked for removal
in the Fluorine release, along with several functions in the win_wua
execution module.
 2018-03-16 17:07:46 -04:00
Gareth J. Greenaway
4ae7fc4861
Merge branch 'develop' into features/schedule-job-func 2018-03-16 13:29:58 -07:00
Gareth J. Greenaway
7dee478e8f
Merge pull request #46583 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 10
 2018-03-16 13:23:36 -07:00
rallytime
f31bc41083
Revert "Remove deprecated mongodb_user state" 
This reverts commit 2e3bc07cf2.
 2018-03-16 15:39:28 -04:00
rallytime
c1cff82458
Revert "Remove deprecated monggodb_database state" 
This reverts commit 8ded32b84a.
 2018-03-16 15:39:19 -04:00
rallytime
0007934325
Reduce the number of days an issue is stale by 10 2018-03-16 15:19:31 -04:00
rallytime
2492e055cd
Update old utils paths to use new paths 2018-03-16 15:13:46 -04:00
rallytime
71178940e3
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - salt/utils/schedule.py
 2018-03-16 15:09:16 -04:00
Nicole Thomas
b7349b3367
Merge pull request #46566 from yred/develop 
Break out of ~infinite loop in boto_asg.get_instances
 2018-03-16 13:03:48 -04:00
Michele Bologna
82a9bb3b18
Fix: decrease loglevel when unable to resolve addr 
It occurs that when the machine has multiple interfaces without an associated FQDN, Salt logs are polluted by this error.
Some examples:

```
caasp-admin:~ # uptime
 09:08am  up   0:13,  2 users,  load average: 1.30, 1.37, 0.98
caasp-admin:~ # docker logs $(docker ps | grep salt-master | awk '{print $1}') 2>&1 | grep "Exception during resolving address" | wc -l
528
```

```
caasp-admin:~ # docker exec -it $(docker ps | grep salt-master | awk '{print $1}') salt '*' cmd.run uptime
b24f41eb4cc94624862ca0c9e8afcd15:
     09:08am  up   0:11,  0 users,  load average: 1.26, 0.83, 0.40
admin:
     09:08am  up   0:13,  2 users,  load average: 1.33, 1.37, 0.99
ba8c76af029043a39ba917f7ab2af796:
     09:08am  up   0:12,  0 users,  load average: 0.84, 0.63, 0.32
7b7aa52158524556a0c46ae57569ce93:
     09:08am  up   0:11,  1 user,  load average: 1.05, 0.77, 0.38
5ab0e18cbd084e9088a928a17edb86cb:
     09:08am  up   0:10,  0 users,  load average: 0.12, 0.25, 0.20
1756c9cd9a9a402b91d8636400d1e512:
     09:08am  up   0:09,  0 users,  load average: 0.12, 0.23, 0.14
ca:
     09:08am  up   0:13,  0 users,  load average: 1.33, 1.37, 0.99
caasp-admin:~ # docker exec -it $(docker ps | grep salt-master | awk '{print $1}') salt '*' cmd.run "bash -c 'cat /var/log/salt/minion | grep \"Exception during resolving address\" | wc -l'"
admin:
    63
ba8c76af029043a39ba917f7ab2af796:
    47
5ab0e18cbd084e9088a928a17edb86cb:
    55
7b7aa52158524556a0c46ae57569ce93:
    59
b24f41eb4cc94624862ca0c9e8afcd15:
    47
1756c9cd9a9a402b91d8636400d1e512:
    59
ca:
    25
```

This patch changes the log level of the exception to INFO, since the resolve-unable problem is not blocking.
 2018-03-16 12:24:43 +01:00
Pedro Algarvio
fd7c14d64c
Allow running the schedule jobs to run in the foreground. 2018-03-16 10:22:27 +00:00
Yasin A
e6fc2c9c3f Break out of ~infinite loop 2018-03-15 12:42:16 -07:00
Nicole Thomas
6d89ee06bc
Merge pull request #46545 from garethgreenaway/882_fqdns_grain_failing 
[develop] Fixes to grains/core.py
 2018-03-15 14:58:27 -04:00
Tom Williams
d5f75508c0 INFRA-6667 - avoid stack-trace in boto_asg module 2018-03-15 13:27:45 -04:00
Nicole Thomas
c9d91b2e99
Merge pull request #46528 from mkobit/mk/touchup-references 
Touch up glossary references
 2018-03-15 13:24:39 -04:00
Nicole Thomas
1191d5b379
Merge pull request #46540 from s0undt3ch/2018.3 
Some missing `isinstance` checks.
 2018-03-15 12:17:19 -04:00
Nicole Thomas
5429438e4b
Merge pull request #46513 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-15 11:58:59 -04:00
Gareth J. Greenaway
0a0abf1a48
Returning a sorted list of the FQDNS names so the results are consistent. 2018-03-14 09:22:07 -07:00
Pedro Algarvio
fa1d668774
Some missing isinstance checks. Committed again through a PR. 2018-03-14 15:59:36 +00:00
Pedro Algarvio
78c0b77afd
Revert "Some missing isinstance checks". Pushed directly. 
This reverts commit 2a7dd73710.
 2018-03-14 14:01:22 +00:00
Pedro Algarvio
2a7dd73710
Some missing isinstance checks 2018-03-14 13:57:35 +00:00
Nicole Thomas
c88c20e1be
Merge pull request #45883 from anttipalsola/add-dict-mode-to-pillar_ldap 
pillar_ldap: Add 'mode: dict'
 2018-03-14 07:57:04 -04:00
Nicole Thomas
d0c27b8186
Merge pull request #46089 from rongzeng54/fix_for_minion_conf 
bugfix for auth_safemode
 2018-03-14 07:56:08 -04:00
Mike Kobit
4ac2c01356
Touch up glossary references 
Signed-off-by: Mike Kobit <mkobit@gmail.com>
 2018-03-13 17:28:54 -05:00
Nicole Thomas
9c8573e473
Merge pull request #46499 from rallytime/fix-46475 
Remove deprecated syntax for "profile" in vault pillar
 2018-03-13 16:03:05 -04:00
rallytime
70097e32b4
Remove the deprecated 'driver' option from docker_network.absent 
This option had no functionality and was marked for removal in the Fluorine release.
 2018-03-13 14:15:27 -04:00
rallytime
57091c05f7
Remove deprecated docker state 
All functions in the docker state was deprecated and marked for removal in the
Fluorine release. Since no functions would remain in the state, the state has
been removed.
 2018-03-13 14:09:19 -04:00
rallytime
30e499198c
Remove support for the "ref" option in the git.detached state 
This code was marked for removal in the Fluorine release. "rev" should
be used instead.
 2018-03-13 13:54:52 -04:00