summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-24 22:36:19 +0000
committerGerrit Code Review <review@openstack.org>2012-01-24 22:36:19 +0000
commit06ba4a2c2c37b464fb14a963dd97364cf71f1456 (patch)
treeb20e9ea9ed00be4a9b53acf4ec6ebe4594858489 /doc/source
parentbf5f01ce637ad80c46c2d30bd563829f1e5bf18f (diff)
parent4cbf0984f9e07cf0395d87492406bf61a82c967f (diff)
Merge "Bug #916312: nova-manage network modify --network flag is inconsistent."
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/runnova/managing.networks.rst17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/source/runnova/managing.networks.rst b/doc/source/runnova/managing.networks.rst
index 9eea46d70..f19d0b8ce 100644
--- a/doc/source/runnova/managing.networks.rst
+++ b/doc/source/runnova/managing.networks.rst
@@ -68,3 +68,20 @@ Network Management
[network_size=FLAG], [vlan_start=FLAG],
[vpn_start=FLAG]
+* network modify: Associate/disassociate network with project and/or host.
+
+ * :option:`--fixed_range=\<IP range\>` - Specify the network to modify by
+ IP range. Required.
+ * :option:`--project=\<project name\>` - Project name to associate.
+ Optional.
+ * :option:`--host=\<host\>` - Host to associate. Optional.
+ * :option:`--disassociate-project` - Disassociate network from project.
+ Optional, mutually exclusive with :option:`--project`.
+ * :option:`--disassociate-host` - Disassociate host from project.
+ Optional, mutually exclusive with :option:`--host`.
+
+* network delete: Deletes a network. Precisely one of :option:`--fixed_range`
+ or :option:`--uuid` must be specified.
+
+ * :option:`--fixed_range=\<IP range\>` - Specify the network by range.
+ * :option:`--uuid=\<UUID\>` - Specify the network by UUID.