Release preos, i.e. make it non-beta
This commit is contained in:
parent
b657ba8221
commit
97bcfcc23c
4 changed files with 11 additions and 13 deletions
|
@ -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', )),
|
||||
|
|
|
@ -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]:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue