diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_config.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_config.xml index 178f042186..42d9ed6449 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_config.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_config.xml @@ -211,13 +211,11 @@ catalog.$Region.network.name = Network Service
Metadata Configuration - The OpenStack Compute service allows VMs to query metadata - associated with a VM by making a web request to a special - 169.254.169.254 address. Quantum supports proxying those - requests to nova-api, even when the requests are made from isolated - networks, or from multiple networks that use overlapping IP addresses. - Enabling this requires setting the following fields in nova.conf: - + The OpenStack Compute service allows VMs to query metadata associated with a VM by + making a web request to a special 169.254.169.254 address. Neutron supports proxying + those requests to nova-api, even when the requests are made from isolated networks, + or from multiple networks that use overlapping IP addresses. Enabling this requires + setting the following fields in nova.conf: diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml index 388fddd8c7..b008582de3 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml @@ -389,8 +389,8 @@ interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
Install L3 Agent - Quantum has a widely used API extension to allow administrators and tenants to create "routers" that - connect to L2 networks. + Neutron has a widely used API extension to allow administrators and tenants to + create "routers" that connect to L2 networks. Many plugins rely on the L3 service agent to implement this L3 functionality. However, the following plugins have built in L3 capabilities: diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_preface.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_preface.xml index 93c1c7bfa6..7882a21b42 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_preface.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_preface.xml @@ -4,11 +4,18 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch_preface"> Preface - OpenStack Networking was created to provide a rich and - tenant-facing API for defining network connectivity and - addressing in the cloud. The project, code-named "quantum," - gives operators the ability to leverage different networking - technologies to power their cloud networking.   + OpenStack Networking was created to provide a rich and tenant-facing + API for defining network connectivity and addressing in the cloud. + The project, code-named "Neutron" (formerly known as Quantum), gives + operators the ability to leverage different networking technologies to + power their cloud networking. + The Board of Directors and Technical Committee members involved in + Networking related development and documentation has decided to change + the project name to "Neutron", as part of a legal agreement with Quantum + Corporation, the owner of the "Quantum" trademark. + Any references to the previous project code name will be removed in this guide whenever is + possible, all the configuration files will change in Havana release and this guide will be + updated respectively.
Intended Audience This guide assists OpenStack administrators in @@ -87,19 +94,17 @@
Resources - For more information on OpenStack Networking and the - other network-related projects, see the project page on - the OpenStack wiki (wiki.openstack.org/Quantum). + For more information on OpenStack Networking and the other network-related projects, + see the project page on the OpenStack wiki (wiki.openstack.org/Neutron). For information about programming against the OpenStack Networking API, see the OpenStack Networking API Guide (v2.0). We welcome feedback, comments, and bug reports at bugs.launchpad.net/Quantum. + xlink:href="https://bugs.launchpad.net/neutron">bugs.launchpad.net/Neutron.
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_using.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_using.xml index f07d678258..7948da6bb4 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_using.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_using.xml @@ -15,15 +15,12 @@ admin on behalf of the tenant. 
Core OpenStack Networking API Features - Once OpenStack Networking is installed and running, both tenants and - admins primarily interact with the service via - create-read-update-delete (CRUD) API operations performed - either directly against the API, or more commonly via the - 'quantum' CLI tool.  Like other OpenStack CLI tools, the - 'quantum' tool is just a basic wrapper around the OpenStack Networking - API, so any operation that can be performed via the CLI - has an equivalent API call that can be performed - programmatically.  + Once OpenStack Networking is installed and running, both tenants and admins primarily + interact with the service via create-read-update-delete (CRUD) API operations performed + either directly against the API, or more commonly via the 'neutron' CLI tool.  Like + other OpenStack CLI tools, the 'neutron' tool is just a basic wrapper around the + OpenStack Networking API, so any operation that can be performed via the CLI has an + equivalent API call that can be performed programmatically.  The CLI supports many options for filtering results, limiting fields show, etc.  For details, refer to the OpenStack Networking CLI documentation.  
@@ -442,21 +439,25 @@ nova boot --image <img> --flavor <flavor> --nic port-id=<port-id&
Security Groups (Enabling Ping and SSH on VMs) - If using a plugin that implements quantum security groups you can configure security group rules directly - by using quantum security-group-rule-create to enable access to your VMs. The example below allows ping - and ssh to your VMs. - + If using a plugin that implements neutron security groups you can configure security + group rules directly by using quantum security-group-rule-create to enable access to + your VMs. The example below allows ping and + ssh to your VMs. + $ quantum security-group-rule-create --protocol icmp --direction ingress default $ quantum security-group-rule-create --protocol tcp --port-range-min 22 --port-range-max 22 --direction ingress default - If your plugin does not implement quantum security group, security groups can still be leveraged via OpenStack Compute. - This can be done using nova secgroup-add-rule or euca-authorize command to enable accesses to your VMs. - Below are the nova commands to allow ping and ssh to your VMs. + If your plugin does not implement neutron security group, security groups can still be + leveraged via OpenStack Compute. This can be done using nova + secgroup-add-rule or euca-authorize command to + enable accesses to your VMs. Below are the nova commands to allow + ping and ssh to your VMs. $ nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 $ nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 - If your plugin implements quantum security groups you can still leverage nova security groups by setting security_group_api = quantum in nova.conf. - After setting this all nova security group commands will be proxied to quantum.
+ If your plugin implements neutron security groups you can still leverage nova security groups + by setting security_group_api = quantum in nova.conf. After + setting this all nova security group commands will be proxied to quantum.