diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-07 15:54:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-07 15:54:23 +0000 |
| commit | feb5f0e842e4b493583d24209be9c3594dc31559 (patch) | |
| tree | 11795d5a072fc02e4b3dbbb6a3d98058df0f3f5a | |
| parent | b31e33fd18acda395f04ed3384dc06ae5b725a40 (diff) | |
| parent | 5d8231fa149bca71ca94d108b2ef7c2654d863b9 (diff) | |
| download | python-ironicclient-feb5f0e842e4b493583d24209be9c3594dc31559.tar.gz | |
Merge "Follow-up to the configdrive change"
| -rwxr-xr-x | ironicclient/osc/v1/baremetal_node.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/configdrive-7bd2b67830691b2e.yaml | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ironicclient/osc/v1/baremetal_node.py b/ironicclient/osc/v1/baremetal_node.py index e940731..c44aefd 100755 --- a/ironicclient/osc/v1/baremetal_node.py +++ b/ironicclient/osc/v1/baremetal_node.py @@ -33,8 +33,10 @@ CONFIG_DRIVE_ARG_HELP = _( "the path to the configuration drive file OR the path to a " "directory containing the config drive files OR a JSON object to build " "config drive from. In case it's a directory, a config drive will be " - "generated from it. In case it's a JSON object, a config drive will " - "be generated on the server side.") + "generated from it. In case it's a JSON object with optional keys " + "`meta_data`, `user_data` and `network_data`, a config drive will " + "be generated on the server side (see the bare metal API reference for " + "more details).") SUPPORTED_INTERFACES = ['bios', 'boot', 'console', 'deploy', 'inspect', diff --git a/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml b/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml index b7dbed3..3ef0ea0 100644 --- a/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml +++ b/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml @@ -2,4 +2,8 @@ features: - | Supports passing a JSON object to ``--config-drive`` to build the config - drive on the server side (requires API version 1.56). + drive on the server side (requires API version 1.56) to the following + commands: + + openstack baremetal node deploy <node> --config-drive '{...}' + openstack baremetal node rebuild <node> --config-drive '{...}' |