From 97bcfcc23ce1fa88e763b03a723aad34a9700fca Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Fri, 20 Sep 2019 19:56:17 +0200 Subject: [PATCH] Release preos, i.e. make it non-beta --- cdist/argparse.py | 2 +- cdist/preos/debootstrap/debootstrap.py | 9 ++++----- docs/src/cdist-preos.rst | 4 ++-- docs/src/man1/cdist.rst | 9 ++++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cdist/argparse.py b/cdist/argparse.py index 34493379..ca69cdae 100644 --- a/cdist/argparse.py +++ b/cdist/argparse.py @@ -9,7 +9,7 @@ import cdist.preos # set of beta sub-commands -BETA_COMMANDS = set(('install', 'inventory', 'preos', )) +BETA_COMMANDS = set(('install', 'inventory', )) # set of beta arguments for sub-commands BETA_ARGS = { 'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )), diff --git a/cdist/preos/debootstrap/debootstrap.py b/cdist/preos/debootstrap/debootstrap.py index bd8e5759..f53dd4a7 100644 --- a/cdist/preos/debootstrap/debootstrap.py +++ b/cdist/preos/debootstrap/debootstrap.py @@ -145,7 +145,6 @@ class Debian(object): log = logging.getLogger(cls.__name__) parser = cls.get_parser() - cdist.argparse.add_beta_command(cls._preos_name) args = parser.parse_args(argv) if args.script and not args.mirror: raise cdist.Error("script option cannot be used without " @@ -174,10 +173,10 @@ class Debian(object): new_env = {} for key in env: if key == 'verbose' and env[key]: - if env[key] >= 3: - new_env['debug'] = "yes" - elif env[key] == 2: - new_env['verbose'] = "yes" + if env[key] >= 3: + new_env['debug'] = "yes" + elif env[key] == 2: + new_env['verbose'] = "yes" elif not env[key]: new_env[key] = '' elif isinstance(env[key], bool) and env[key]: diff --git a/docs/src/cdist-preos.rst b/docs/src/cdist-preos.rst index 8b3deff8..e85af2de 100644 --- a/docs/src/cdist-preos.rst +++ b/docs/src/cdist-preos.rst @@ -24,12 +24,12 @@ For example, to create ubuntu PreOS: .. 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 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 specified ssh authorized key (``-k``). After bootstrapping and configuration PXE diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst index 982004b0..7f368e68 100644 --- a/docs/src/man1/cdist.rst +++ b/docs/src/man1/cdist.rst @@ -734,8 +734,7 @@ EXAMPLES % cdist config -f loadbalancers # Configure hosts read from file web.hosts using 16 parallel jobs - # (beta functionality) - % cdist config -b -j 16 -f web.hosts + % cdist config -j 16 -f web.hosts # Display banner cdist banner @@ -792,16 +791,16 @@ EXAMPLES $ cdist config -b -A # 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 # 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 # Create ubuntu PreOS on drive /dev/sdb # 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 \ -P password