Revision 015f1517 lib/cli.py

b/lib/cli.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc.
4
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
115 115
  "IGNORE_SIZE_OPT",
116 116
  "INCLUDEDEFAULTS_OPT",
117 117
  "INTERVAL_OPT",
118
  "INSTANCE_COMMUNICATION_OPT",
118 119
  "MAC_PREFIX_OPT",
119 120
  "MAINTAIN_NODE_HEALTH_OPT",
120 121
  "MASTER_NETDEV_OPT",
......
1686 1687
                                     help="Hotplug devices in case"
1687 1688
                                          " hotplug is supported")
1688 1689

  
1690
INSTANCE_COMMUNICATION_OPT = \
1691
    cli_option("-c", "--communication",
1692
               default=False,
1693
               dest="instance_communication",
1694
               help=constants.INSTANCE_COMMUNICATION_DOC,
1695
               type="bool")
1696

  
1689 1697
#: Options provided by all commands
1690 1698
COMMON_OPTS = [DEBUG_OPT, REASON_OPT]
1691 1699

  
......
2727 2735
    no_install = opts.no_install
2728 2736
    identify_defaults = False
2729 2737
    compress = constants.IEC_NONE
2738
    instance_communication = opts.instance_communication
2730 2739
  elif mode == constants.INSTANCE_IMPORT:
2731 2740
    start = False
2732 2741
    os_type = None
......
2736 2745
    no_install = None
2737 2746
    identify_defaults = opts.identify_defaults
2738 2747
    compress = opts.compress
2748
    instance_communication = False
2739 2749
  else:
2740 2750
    raise errors.ProgrammerError("Invalid creation mode %s" % mode)
2741 2751

  
......
2765 2775
                                tags=tags,
2766 2776
                                no_install=no_install,
2767 2777
                                identify_defaults=identify_defaults,
2768
                                ignore_ipolicy=opts.ignore_ipolicy)
2778
                                ignore_ipolicy=opts.ignore_ipolicy,
2779
                                instance_communication=instance_communication)
2769 2780

  
2770 2781
  SubmitOrSend(op, opts)
2771 2782
  return 0

Also available in: Unified diff