author | Matt Keenan <matt.keenan@oracle.com> |
Fri, 19 Jun 2015 09:35:02 +0100 | |
branch | s11-update |
changeset 4508 | d8924d870370 |
child 5405 | 66fd59fecd68 |
permissions | -rw-r--r-- |
4508
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
1 |
Add wanboot to list of potentially supported boot devices. |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
2 |
|
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
3 |
--- python-ironicclient-0.3.2/ironicclient/v1/node_shell.py.~1~ 2014-12-10 11:10:37.000000000 -0800 |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
4 |
+++ python-ironicclient-0.3.2/ironicclient/v1/node_shell.py 2015-01-09 00:10:16.660604875 -0800 |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
5 |
@@ -344,8 +344,8 @@ def do_node_set_console_mode(cc, args): |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
6 |
@cliutils.arg( |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
7 |
'device', |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
8 |
metavar='<boot device>', |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
9 |
- choices=['pxe', 'disk', 'cdrom', 'bios', 'safe'], |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
10 |
- help="Supported boot devices: 'pxe', 'disk', 'cdrom', 'bios', 'safe'") |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
11 |
+ choices=['pxe', 'disk', 'cdrom', 'bios', 'safe', 'wanboot'], |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
12 |
+ help="Supported boot devices: 'pxe', 'disk', 'cdrom', 'bios', 'safe', 'wanboot'") |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
13 |
@cliutils.arg( |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
14 |
'--persistent', |
d8924d870370
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service)
Matt Keenan <matt.keenan@oracle.com>
parents:
diff
changeset
|
15 |
dest='persistent', |