Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add salt bundle bootstrapping support and Raspbian 10 and 9 #3895

Merged
merged 4 commits into from
Jul 14, 2021
Merged

Add salt bundle bootstrapping support and Raspbian 10 and 9 #3895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
294df44
Add salt bundle bootstrapping support and Raspbian 10 and 9
vzhestkov Apr 20, 2021
c022fdf
Fix VENV_ENABLED conditions and IDs for util.mgr_switch_to_venv_minion
vzhestkov Jun 18, 2021
a3e0ffb
Remove duplicated trust_res_gpg_key and install_gnupg_debian
vzhestkov Jun 18, 2021
6abff7f
Merge branch 'master' into fix-states-for-the-bundle
vzhestkov Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion spacewalk/certs-tools/rhn_bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def getDefaultOptions():
'http-proxy-password': "",
'allow-config-actions': 0,
'allow-remote-commands': 0,
'no-bundle': 0,
'no-gpg': 0,
'no-up2date': 0,
'up2date': 0,
Expand Down Expand Up @@ -246,6 +247,9 @@ def getSetString(value):
Option('--allow-remote-commands',
action='store_true',
help='boolean; allow arbitrary remote commands - requires installing certain rhncfg-* RPMs probably via an activation key. (currently: %s)' % getSetString(defopts['allow-remote-commands'])),
Option('--no-bundle',
action='store_true',
help='boolean; avoid installing salt minion bundle (venv-salt-minion) instead of salt minion (currently %s)' % getSetString(defopts['no-bundle'])),
Option('--no-gpg',
action='store_true',
help='(not recommended) boolean; turn off GPG checking by the clients (currently %s)' % getSetString(defopts['no-gpg'])),
Expand Down Expand Up @@ -314,6 +318,7 @@ def parseCommandline():
# "not not" forces the integer value
'allow-config-actions': not not options.allow_config_actions,
'allow-remote-commands': not not options.allow_remote_commands,
'no-bundle': not not options.no_bundle,
'no-gpg': not not options.no_gpg,
'no-up2date': not not options.no_up2date,
'up2date': not not options.up2date,
Expand Down Expand Up @@ -391,7 +396,7 @@ def processCommandline():

# forcing numeric values
for opt in ['allow_config_actions', 'allow_remote_commands',
'no_gpg', 'no_up2date', 'traditional', 'up2date', 'verbose']:
'no_bundle', 'no_gpg', 'no_up2date', 'traditional', 'up2date', 'verbose']:
# operator.truth should return (0, 1) or (False, True) depending on
# the version of python; passing any of those values through int()
# will return an int
Expand Down
Loading