tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Release preos, i.e. make it non-beta

Browse source
This commit is contained in:
Darko Poljak 2019-09-20 19:56:17 +02:00
parent b657ba8221
commit 97bcfcc23c
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/argparse.py
View file

@ -9,7 +9,7 @@ import cdist.preos
# set of beta sub-commands # set of beta sub-commands
BETA_COMMANDS = set(('install', 'inventory', 'preos', )) BETA_COMMANDS = set(('install', 'inventory', ))
# set of beta arguments for sub-commands # set of beta arguments for sub-commands
BETA_ARGS = { BETA_ARGS = {
'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )), 'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),

9
cdist/preos/debootstrap/debootstrap.py
View file

@ -145,7 +145,6 @@ class Debian(object):
log = logging.getLogger(cls.__name__) log = logging.getLogger(cls.__name__)
parser = cls.get_parser() parser = cls.get_parser()
cdist.argparse.add_beta_command(cls._preos_name)
args = parser.parse_args(argv) args = parser.parse_args(argv)
if args.script and not args.mirror: if args.script and not args.mirror:
raise cdist.Error("script option cannot be used without " raise cdist.Error("script option cannot be used without "
@ -174,10 +173,10 @@ class Debian(object):
new_env = {} new_env = {}
for key in env: for key in env:
if key == 'verbose' and env[key]: if key == 'verbose' and env[key]:
if env[key] >= 3: if env[key] >= 3:
new_env['debug'] = "yes" new_env['debug'] = "yes"
elif env[key] == 2: elif env[key] == 2:
new_env['verbose'] = "yes" new_env['verbose'] = "yes"
elif not env[key]: elif not env[key]:
new_env[key] = '' new_env[key] = ''
elif isinstance(env[key], bool) and env[key]: elif isinstance(env[key], bool) and env[key]:

4
docs/src/cdist-preos.rst
View file

@ -24,12 +24,12 @@ For example, to create ubuntu PreOS:
.. code-block:: sh .. code-block:: sh
$ cdist preos ubuntu /preos/preos-ubuntu -b -C \ $ cdist preos ubuntu /preos/preos-ubuntu -B -C \
-k ~/.ssh/id_rsa.pub -p /preos/pxe-ubuntu -k ~/.ssh/id_rsa.pub -p /preos/pxe-ubuntu
For more info about available options see cdist manual page. For more info about available options see cdist manual page.
This will bootstrap (``-b``) ubuntu PreOS in ``/preos/preos-ubuntu`` directory, it This will bootstrap (``-B``) ubuntu PreOS in ``/preos/preos-ubuntu`` directory, it
will be configured (``-C``) using default built-in initial manifest and with will be configured (``-C``) using default built-in initial manifest and with
specified ssh authorized key (``-k``). specified ssh authorized key (``-k``).
After bootstrapping and configuration PXE After bootstrapping and configuration PXE

9
docs/src/man1/cdist.rst
View file

@ -734,8 +734,7 @@ EXAMPLES
% cdist config -f loadbalancers % cdist config -f loadbalancers
# Configure hosts read from file web.hosts using 16 parallel jobs # Configure hosts read from file web.hosts using 16 parallel jobs
# (beta functionality) % cdist config -j 16 -f web.hosts
% cdist config -b -j 16 -f web.hosts
# Display banner # Display banner
cdist banner cdist banner
@ -792,16 +791,16 @@ EXAMPLES
$ cdist config -b -A $ cdist config -b -A
# Create default debian PreOS in debug mode # Create default debian PreOS in debug mode
$ cdist preos debian /preos/preos-debian -b -vvvv -C \ $ cdist preos debian /preos/preos-debian -vvvv -C \
-k ~/.ssh/id_rsa.pub -p /preos/pxe-debian -k ~/.ssh/id_rsa.pub -p /preos/pxe-debian
# Create ubuntu PreOS # Create ubuntu PreOS
$ cdist preos ubuntu /preos/preos-ubuntu -b -C \ $ cdist preos ubuntu /preos/preos-ubuntu -C \
-k ~/.ssh/id_rsa.pub -p /preos/pxe-ubuntu -k ~/.ssh/id_rsa.pub -p /preos/pxe-ubuntu
# Create ubuntu PreOS on drive /dev/sdb # Create ubuntu PreOS on drive /dev/sdb
# and set root password to 'password'. # and set root password to 'password'.
$ cdist preos ubuntu /mnt -b -B -C \ $ cdist preos ubuntu /mnt -B -C \
-k ~/.ssh/id_rsa.pub -D /dev/sdb \ -k ~/.ssh/id_rsa.pub -D /dev/sdb \
-P password -P password