Skip to content

Commit f0e7ac8

Browse files
garethgreenawaygarethgreenaway
authored
Merge branch 'master' into 55061_fix_network_settings_beacon_wildcard_interface
2 parents 14eb5a5 + 51adb38 commit f0e7ac8

File tree

239 files changed

+30250
-9981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+30250
-9981
lines changed

‎.ci/kitchen-amazon1-py2

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--ssh-tests',
1212
python_version: 'py2',
13-
testrun_timeout: 6,
14-
use_spot_instances: true)
13+
testrun_timeout: 7,
14+
use_spot_instances: false)
1515

1616
// vim: ft=groovy

‎.ci/kitchen-windows2016-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--unit',
1212
python_version: 'py3',
13-
testrun_timeout: 8,
13+
testrun_timeout: 9,
1414
use_spot_instances: false)
1515

1616
// vim: ft=groovy

‎.ci/kitchen-windows2019-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runTestSuite(
1010
nox_env_name: 'runtests-zeromq',
1111
nox_passthrough_opts: '--unit',
1212
python_version: 'py3',
13-
testrun_timeout: 8,
13+
testrun_timeout: 9,
1414
use_spot_instances: false)
1515

1616
// vim: ft=groovy

‎.git-blame-ignore-revs

Whitespace-only changes.

‎.github/stale.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33
# Number of days of inactivity before an issue becomes stale
44
# 600 is approximately 1 year and 8 months
5-
daysUntilStale: 600
5+
daysUntilStale: 30
66

77
# Number of days of inactivity before a stale issue is closed
88
daysUntilClose: 7
99

1010
# Issues with these labels will never be considered stale
11-
#exemptLabels:
12-
# - pinned
13-
# - security
11+
exemptLabels:
12+
- Confirmed
13+
- Blocker
14+
- Critical
15+
- P1
16+
- P2
1417

1518
# Label to use when marking an issue as stale
1619
staleLabel: stale

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ MANIFEST
1414
*.DS_Store
1515
.pytest_cache
1616
Pipfile.lock
17+
.mypy_cache/*
1718

1819
# virtualenv
1920
# - ignores directories of a virtualenv when you create it right on
@@ -103,8 +104,12 @@ tests/integration/cloud/providers/pki/minions
103104
# Ignore nox virtualenvs
104105
/.nox/
105106

107+
# Ignore pyenv files
108+
.python-version
109+
106110
# Kitchen tests files
107111
.kitchen.local.yml
112+
kitchen.local.yml
108113
.kitchen/
109114
.bundle/
110115
Gemfile.lock

‎conf/cloud.profiles

+11
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,14 @@
2525
# script: Fedora
2626
# minion:
2727
# cheese: edam
28+
29+
#tencentcloud-guangzhou-s1sm1:
30+
# provider: my-tencentcloud-config
31+
# availability_zone: ap-guangzhou-3
32+
# image: img-31tjrtph
33+
# size: S1.SMALL1
34+
# allocate_public_ip: True
35+
# internet_max_bandwidth_out: 1
36+
# password: '153e41ec96140152'
37+
# securitygroups:
38+
# - sg-5e90804b

‎conf/cloud.profiles.d/tencentcloud-guangzhou-s1sm1.profiles

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#tencentcloud-guangzhou-s1sm1:
2+
# provider: my-tencentcloud-config
3+
# availability_zone: ap-guangzhou-3
4+
# image: img-31tjrtph
5+
# size: S1.SMALL1
6+
# allocate_public_ip: True
7+
# internet_max_bandwidth_out: 1
8+
# password: '153e41ec96140152'
9+
# securitygroups:
10+
# - sg-5e90804b

‎conf/cloud.providers

+9
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,12 @@
8787

8888
#my-scaleway-config:
8989
# driver: scaleway
90+
91+
#my-tencentcloud-config:
92+
# driver: tencentcloud
93+
# Tencent Cloud Secret Id
94+
# id: AKIDA64pOio9BMemkApzevX0HS169S4b750A
95+
# Tencent Cloud Secret Key
96+
# key: 8r2xmPn0C5FDvRAlmcJimiTZKVRsk260
97+
# Tencent Cloud Region
98+
# location: ap-guangzhou

‎conf/cloud.providers.d/tencent.conf

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#my-tencentcloud-config:
2+
# driver: tencentcloud
3+
# Tencent Cloud Secret Id
4+
# id: AKIDA64pOio9BMemkApzevX0HS169S4b750A
5+
# Tencent Cloud Secret Key
6+
# key: 8r2xmPn0C5FDvRAlmcJimiTZKVRsk260
7+
# Tencent Cloud Region
8+
# location: ap-guangzhou

‎conf/master

+7-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
# the autosign_file and the auto_accept setting.
351351
#autoreject_file: /etc/salt/autoreject.conf
352352

353-
# If the autosign_grains_dir is specified, incoming keys from minons with grain
353+
# If the autosign_grains_dir is specified, incoming keys from minions with grain
354354
# values matching those defined in files in this directory will be accepted
355355
# automatically. This is insecure. Minions need to be configured to send the grains.
356356
#autosign_grains_dir: /etc/salt/autosign_grains
@@ -1299,3 +1299,9 @@
12991299
# use OS defaults, typically 75 seconds on Linux, see
13001300
# /proc/sys/net/ipv4/tcp_keepalive_intvl.
13011301
#tcp_keepalive_intvl: -1
1302+
1303+
1304+
##### NetAPI settings #####
1305+
############################################
1306+
# Allow the raw_shell parameter to be used when calling Salt SSH client via API
1307+
#netapi_allow_raw_shell: True

‎conf/minion

+5
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,11 @@
548548
# - edit.vim
549549
# - hyper
550550
#
551+
# List of grains to pass in start event when minion starts up:
552+
#start_event_grains:
553+
# - machine_id
554+
# - uuid
555+
#
551556
# Top file to execute if startup_states is 'top':
552557
#top_file: ''
553558

‎conf/suse/master

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ syndic_user: salt
302302
# the autosign_file and the auto_accept setting.
303303
#autoreject_file: /etc/salt/autoreject.conf
304304

305-
# If the autosign_grains_dir is specified, incoming keys from minons with grain
305+
# If the autosign_grains_dir is specified, incoming keys from minions with grain
306306
# values matching those defined in files in this directory will be accepted
307307
# automatically. This is insecure. Minions need to be configured to send the grains.
308308
#autosign_grains_dir: /etc/salt/autosign_grains

‎doc/conf.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ def inner(fn, *iargs, **ikwargs): # pylint: disable=unused-argument
255255
project = 'Salt'
256256
repo_primary_branch = 'master' # This is the default branch on GitHub for the Salt project
257257
version = salt.version.__version__
258-
latest_release = '2019.2.2' # latest release
259-
previous_release = '2018.3.4' # latest release from previous branch
260-
previous_release_dir = '2018.3' # path on web server for previous branch
258+
latest_release = os.environ.get('LATEST_RELEASE', 'latest_release') # latest release (2019.2.3)
259+
previous_release = os.environ.get('PREVIOUS_RELEASE', 'previous_release') # latest release from previous branch (2018.3.5)
260+
previous_release_dir = os.environ.get('PREVIOUS_RELEASE_DIR', 'previous_release_dir') # path on web server for previous branch (2018.3)
261261
next_release = '' # next release
262262
next_release_dir = '' # path on web server for next release branch
263263

@@ -268,7 +268,7 @@ def inner(fn, *iargs, **ikwargs): # pylint: disable=unused-argument
268268
copyright = time.strftime("%Y")
269269

270270
# < --- START do not merge these settings to other branches START ---> #
271-
build_type = repo_primary_branch # latest, previous, master, next
271+
build_type = os.environ.get('BUILD_TYPE', repo_primary_branch) # latest, previous, master, next
272272
# < --- END do not merge these settings to other branches END ---> #
273273

274274
# Set google custom search engine
@@ -282,7 +282,11 @@ def inner(fn, *iargs, **ikwargs): # pylint: disable=unused-argument
282282
search_cx = '011515552685726825874:ht0p8miksrm' # latest
283283
elif build_type == 'previous':
284284
release = previous_release
285-
if release.startswith('2018.3'):
285+
if release.startswith('3000'):
286+
search_cx = '011515552685726825874:3skhaozjtyn' # 3000
287+
elif release.startswith('2019.2'):
288+
search_cx = '011515552685726825874:huvjhlpptnm' # 2019.2
289+
elif release.startswith('2018.3'):
286290
search_cx = '011515552685726825874:vadptdpvyyu' # 2018.3
287291
elif release.startswith('2017.7'):
288292
search_cx = '011515552685726825874:w-hxmnbcpou' # 2017.7

‎doc/faq.rst

+29
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,35 @@ Restart the Minion from the command line:
394394
salt -G kernel:Windows cmd.run_bg 'C:\salt\salt-call.bat service.restart salt-minion'
395395
salt -C 'not G@kernel:Windows' cmd.run_bg 'salt-call service.restart salt-minion'
396396
397+
Waiting for minions to come back online
398+
***************************************
399+
400+
A common issue in performing automated restarts of a salt minion, for example during
401+
an orchestration run, is that it will break the orchestration since the next statement
402+
is likely to be attempted before the minion is back online. This can be remedied
403+
by inserting a blocking waiting state that only returns when the selected minions
404+
are back up (note: this will only work in orchestration states since `manage.up`
405+
needs to run on the master):
406+
407+
.. code-block:: jinja
408+
409+
Wait for salt minion:
410+
loop.until_no_eval:
411+
- name: saltutil.runner
412+
- expected:
413+
- my_minion
414+
- args:
415+
- manage.up
416+
- kwargs:
417+
tgt: my_minion
418+
- period: 3
419+
- init_wait: 3
420+
421+
This will, after an initial delay of 3 seconds, execute the `manage.up`-runner
422+
targeted specifically for `my_minion`. It will do this every `period` seconds
423+
until the `expected` data is returned. The default timeout is 60s but can be configured
424+
as well.
425+
397426
Salting the Salt Master
398427
-----------------------
399428

‎doc/man/salt-api.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-API" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-API" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-api \- salt-api Command
66
.

‎doc/man/salt-call.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CALL" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-CALL" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-call \- salt-call Documentation
66
.

‎doc/man/salt-cloud.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CLOUD" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-CLOUD" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-cloud \- Salt Cloud Command
66
.

‎doc/man/salt-cp.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CP" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-CP" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-cp \- salt-cp Documentation
66
.

‎doc/man/salt-key.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-KEY" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-KEY" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-key \- salt-key Documentation
66
.

‎doc/man/salt-master.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-MASTER" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-MASTER" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-master \- salt-master Documentation
66
.

‎doc/man/salt-minion.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-MINION" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-MINION" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-minion \- salt-minion Documentation
66
.

‎doc/man/salt-proxy.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-PROXY" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-PROXY" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-proxy \- salt-proxy Documentation
66
.

‎doc/man/salt-run.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-RUN" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-RUN" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-run \- salt-run Documentation
66
.

‎doc/man/salt-ssh.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-SSH" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-SSH" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-ssh \- salt-ssh Documentation
66
.

‎doc/man/salt-syndic.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-SYNDIC" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-SYNDIC" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-syndic \- salt-syndic Documentation
66
.

‎doc/man/salt-unity.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-UNITY" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT-UNITY" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt-unity \- salt-unity Command
66
.

‎doc/man/salt.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT" "1" "Oct 02, 2019" "2019.2.2" "Salt"
3+
.TH "SALT" "1" "Jan 15, 2020" "3000" "Salt"
44
.SH NAME
55
salt \- salt
66
.

0 commit comments

Comments
 (0)