diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/cli/command-objects/network-agent.rst | 121 | ||||
| -rw-r--r-- | doc/source/cli/command-objects/router.rst | 5 | ||||
| -rw-r--r-- | doc/source/cli/command-objects/server.rst | 7 | ||||
| -rw-r--r-- | doc/source/cli/plugin-commands.rst | 10 |
4 files changed, 110 insertions, 33 deletions
diff --git a/doc/source/cli/command-objects/network-agent.rst b/doc/source/cli/command-objects/network-agent.rst index f69d0ece..2ceb263f 100644 --- a/doc/source/cli/command-objects/network-agent.rst +++ b/doc/source/cli/command-objects/network-agent.rst @@ -33,7 +33,34 @@ Add network to an agent .. describe:: <network> - Network to be added to an agent (ID or name) + Network to be added to an agent (name or ID) + +network agent add router +------------------------ + +Add router to an agent + +.. program:: network agent add router +.. code:: bash + + openstack network agent add router + [--l3] + <agent-id> + <router> + +.. option:: --l3 + + Add router to L3 agent + +.. _network_agent_add_router-agent-id: +.. describe:: <agent-id> + + Agent to which a router is added (ID only) + +.. _network_agent_add_router-router: +.. describe:: <router> + + Router to be added to an agent (name or ID) network agent delete -------------------- @@ -62,7 +89,8 @@ List network agents openstack network agent list [--agent-type <agent-type>] [--host <host>] - [--network <network>] + [--network <network> | --router <router>] + [--long] .. option:: --agent-type <agent-type> @@ -77,7 +105,69 @@ List network agents .. option:: --network <network> - List agents hosting a network (ID or name) + List agents hosting a network (name or ID) + +.. option:: --router <router> + + List agents hosting this router (name or ID) + +.. option:: --long + + List additional fields in output + +network agent remove network +---------------------------- + +Remove network from an agent + +.. program:: network agent remove network +.. code:: bash + + openstack network agent remove network + [--dhcp] + <agent-id> + <network> + +.. option:: --dhcp + + Remove network from DHCP agent + +.. _network_agent_remove_network-agent-id: +.. describe:: <agent-id> + + Agent to which a network is removed (ID only) + +.. _network_agent_remove_network-network: +.. describe:: <network> + + Network to be removed from an agent (name or ID) + +network agent remove router +--------------------------- + +Remove router from an agent + +.. program:: network agent remove router +.. code:: bash + + openstack agent remove router + [--l3] + <agent-id> + <router> + +.. option:: --l3 + + Remove router from L3 agent + +.. _network_agent_remove_router-agent-id: +.. describe:: <agent-id> + + Agent from which router will be removed (ID only) + +.. _network_agent_remove_router-router: +.. describe:: <router> + + Router to be removed from an agent (name or ID) network agent set ----------------- @@ -124,28 +214,3 @@ Display network agent details .. describe:: <network-agent> Network agent to display (ID only) - -network agent remove network ----------------------------- - -Remove network from an agent - -.. program:: network agent remove network -.. code:: bash - - openstack network agent remove network - [--dhcp] - <agent-id> - <network> - -.. describe:: --dhcp - - Remove network from DHCP agent. - -.. describe:: <agent-id> - - Agent to which a network is removed (ID only) - -.. describe:: <network> - - Network to be removed from an agent (ID or name) diff --git a/doc/source/cli/command-objects/router.rst b/doc/source/cli/command-objects/router.rst index 50e791ea..8bdf81db 100644 --- a/doc/source/cli/command-objects/router.rst +++ b/doc/source/cli/command-objects/router.rst @@ -155,6 +155,11 @@ List routers [--enable | --disable] [--long] [--project <project> [--project-domain <project-domain>]] + [--agent <agent-id>] + +.. option:: --agent <agent-id> + + List routers hosted by an agent (ID only) .. option:: --long diff --git a/doc/source/cli/command-objects/server.rst b/doc/source/cli/command-objects/server.rst index cc580603..11182822 100644 --- a/doc/source/cli/command-objects/server.rst +++ b/doc/source/cli/command-objects/server.rst @@ -330,6 +330,7 @@ List servers [--all-projects] [--project <project> [--project-domain <project-domain>]] [--long] + [--no-name-lookup | -n] [--marker <server>] [--limit <num-servers>] [--deleted] @@ -397,6 +398,12 @@ List servers List additional fields in output +.. option:: --no-name-lookup + + Skips image and flavor names lookup + + ``-n`` may be used as an alias for this option. + .. option:: --marker <server> The last server of the previous page. Display list of servers diff --git a/doc/source/cli/plugin-commands.rst b/doc/source/cli/plugin-commands.rst index 34efdc3d..90c14b87 100644 --- a/doc/source/cli/plugin-commands.rst +++ b/doc/source/cli/plugin-commands.rst @@ -58,11 +58,11 @@ ironic-inspector .. list-plugins:: openstack.baremetal_introspection.v1 :detailed: -karbor ------- - -.. list-plugins:: openstack.data_protection.v1 - :detailed: +.. karbor +.. ------ +.. bug 1705258: Exclude karborclient 0.4.0 until a fixed version is released. +.. .. list-plugins:: openstack.data_protection.v1 +.. :detailed: mistral ------- |