diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 806aefacdd..e6f65a8a15 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -2954,6 +2954,16 @@
Currently not supported in Identity Service.
+
+ multi-host
+
+ High-availability mode for legacy (nova) networking.
+ Each compute node handles NAT and DHCP and acts as a
+ gateway for all of the VMs on it. A networking failure
+ on one compute node doesn't affect VMs on other compute
+ nodes.
+
+ MultiNic
@@ -4749,6 +4759,16 @@
An L2 network segment within Networking.
+
+ virtual networking
+
+ A generic term for virtualization of network functions
+ such as switching, routing, load balancing, and
+ security using a combination of VMs and overlays on
+ physical network infrastructure.
+
+
+ Virtual Network Computing (VNC)
diff --git a/doc/install-guide/ch_networking.xml b/doc/install-guide/ch_networking.xml
index e53b5437d3..e9a42809aa 100644
--- a/doc/install-guide/ch_networking.xml
+++ b/doc/install-guide/ch_networking.xml
@@ -17,6 +17,18 @@
We are updating this material for Icehouse. You may find structure
and/or content issues during this process.
+ Configuring networking in OpenStack can be a bewildering experience.
+ This guide provides step-by-step instructions for both OpenStack
+ Networking (neutron) and the legacy (nova) networking service. If you are
+ unsure which to use, we recommend trying OpenStack Networking because it
+ offers a considerable number of features and flexibility including
+ plug-ins for a variety of
+ emerging products supporting virtual networking.
+ See the
+ Networking
+ chapter of the
+ OpenStack Cloud Administrator Guide for more
+ information.Networking (neutron)
@@ -28,5 +40,6 @@
Legacy networking
+
diff --git a/doc/install-guide/ch_neutron.xml b/doc/install-guide/ch_neutron.xml
deleted file mode 100644
index cfaafec210..0000000000
--- a/doc/install-guide/ch_neutron.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
- Add the Networking service
-
-
- We are updating this material for Icehouse. You may find structure
- and/or content issues during this process.
-
-
- Networking considerations
- OpenStack Networking drivers range from software bridges
- to full control of certain switching hardware. This guide
- focuses on the Open vSwitch driver. However, the theories
- presented here are mostly applicable to other mechanisms,
- and the Networking chapter
- of the OpenStack Configuration Reference
- offers additional information.
- To prepare for installation, see .
-
- If you previously set up networking for your compute node by using
- nova-network, this configuration
- overrides those settings.
-
-
-
-
-
-
-
-
-
diff --git a/doc/install-guide/section_nova-boot.xml b/doc/install-guide/section_nova-boot.xml
index e54c884c16..b2635fd664 100644
--- a/doc/install-guide/section_nova-boot.xml
+++ b/doc/install-guide/section_nova-boot.xml
@@ -29,7 +29,7 @@
/>.
- Configured networking. See Configured networking. See .
diff --git a/doc/install-guide/section_nova-networking-compute-node.xml b/doc/install-guide/section_nova-networking-compute-node.xml
index 7a99c42485..ddae05f320 100644
--- a/doc/install-guide/section_nova-networking-compute-node.xml
+++ b/doc/install-guide/section_nova-networking-compute-node.xml
@@ -1,40 +1,29 @@
- Configure networking
-
- We are updating this material for Icehouse. You may find structure
- and/or content issues during this process.
-
- Configuring networking in OpenStack can be a bewildering experience. The
- following example shows the simplest production-ready
- configuration that is available: the legacy networking in
- OpenStack Compute, with a flat network, that takes care of
- DHCP.
- This set up uses multi-host functionality. Networking is
- configured to be highly available by distributing networking
- functionality across multiple hosts. As a result, no single
- network controller acts as a single point of failure. This process
- configures each compute node for networking.
+ xml:id="nova-networking-compute-node">
+ Configure compute node
+ Legacy networking only involves compute nodes. This section covers
+ deployment of a simple flat network that provides
+ IP addresses to your instances via DHCP. If your
+ environment includes multiple compute nodes, the
+ multi-host feature provides redundancy by spreading
+ network functions across compute nodes.
+ To use legacy networking:
- Install the appropriate packages for compute networking on the
- compute node only. These packages are not required on the controller
- node.
- So that the nova-network service can forward metadata requests on
- each compute node, each compute node must install the nova-api-metadata service, as
- follows:
+ Install the packages:#apt-get install nova-network nova-api-metadata
- #yum install openstack-nova-network
- #zypper install openstack-nova-network
+ #yum install openstack-nova-network openstack-nova-api
+ #zypper install openstack-nova-network openstack-nova-api
-
- Edit the nova.conf file to define the
- networking mode:
- #openstack-config --set /etc/nova/nova.conf DEFAULT \
+
+ Configure parameters in the
+ /etc/nova/nova.conf file:
+
+
+ Under the [DEFAULT] section:
+ #openstack-config --set /etc/nova/nova.conf DEFAULT \
network_manager nova.network.manager.FlatDHCPManager#openstack-config --set /etc/nova/nova.conf DEFAULT \
firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver
@@ -47,51 +36,44 @@
#openstack-config --set /etc/nova/nova.conf DEFAULT flat_interface eth1#openstack-config --set /etc/nova/nova.conf DEFAULT flat_network_bridge br100#openstack-config --set /etc/nova/nova.conf DEFAULT public_interface eth1
-
+ #openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova.network.api.API#openstack-config --set /etc/nova/nova.conf DEFAULT security_group_api nova
- Edit the
- /etc/nova/nova.conf file and add these
- lines to the [DEFAULT] section:
- [DEFAULT]
-...
-
-network_manager=nova.network.manager.FlatDHCPManager
-firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver
-network_size=254
-allow_same_net_traffic=False
-multi_host=True
-send_arp_for_ha=True
-share_dhcp_address=True
-force_dhcp_release=True
-flat_network_bridge=br100
-flat_interface=eth1
-public_interface=eth1
+
+
-
- Provide a local metadata service that is reachable from
- instances on this compute node. Perform this step only on
- compute nodes that do not run the nova-api service.
- #yum install openstack-nova-api
-#service openstack-nova-metadata-api start
-#chkconfig openstack-nova-metadata-api on
+
+ Edit the /etc/nova/nova.conf file:
+
+
+ Add the following keys under the [DEFAULT]
+ section:
+ [DEFAULT]
+...
+network_manager = nova.network.manager.FlatDHCPManager
+firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
+network_size = 254
+allow_same_net_traffic = False
+multi_host = True
+send_arp_for_ha = True
+share_dhcp_address = True
+force_dhcp_release = True
+flat_network_bridge = br100
+flat_interface = eth1
+public_interface = eth1
+
+
- Restart the network service:
- #service nova-network restart
- Start the network
- service and configure it to start when the system
- boots:
- #service openstack-nova-network start
-#chkconfig openstack-nova-network on
+ Restart the services:
+ #service nova-network restart
+#service nova-api-metadata restart
+ Start the services and
+ configure them to start when the system boots:
+ #service openstack-nova-network start
+#service openstack-nova-metadata-api start
+#chkconfig openstack-nova-network on
+#chkconfig openstack-nova-metadata-api on
- Create a network that virtual machines can use. Do this once
- for the entire installation and not on each compute node. Run the
- nova network-create command on the
- controller:
- $source openrc.sh
- $nova network-create vmnet --fixed-range-v4=10.0.0.0/24 \
- --bridge=br100 --multi-host=T
diff --git a/doc/install-guide/section_nova-networking-initial-network.xml b/doc/install-guide/section_nova-networking-initial-network.xml
new file mode 100644
index 0000000000..f240d5fe08
--- /dev/null
+++ b/doc/install-guide/section_nova-networking-initial-network.xml
@@ -0,0 +1,43 @@
+
+ Create initial network
+ Before launching your first instance, you must create the necessary
+ virtual network infrastructure to which the instance will connect.
+ This network typically provides internet access
+ from instances. You can enable internet access
+ to individual instances using a
+ floating IP address and suitable
+ security group rules. The admin
+ tenant owns this network because it provides external network access
+ for multiple tenants.
+ This network shares the same subnet
+ associated with the physical network connected to the external
+ interface on the compute node. You should specify
+ an exclusive slice of this subnet to prevent interference with other
+ devices on the external network.
+
+ Perform these commands on the controller node.
+
+
+ To create the network:
+
+ Source the admin tenant credentials:
+ $source admin-openrc.sh
+
+
+ Create the network:
+ Replace NETWORK_CIDR with the subnet
+ associated with the physical network.
+ $nova network-create demo-net --bridge br100 --multi-host T \
+ --fixed-range-v4 NETWORK_CIDR
+ For example, using an exclusive slice of
+ 203.0.113.0/24 with IP address range
+ 203.0.113.24 to 203.0.113.32:
+
+ $nova network-create demo-net --bridge br100 --multi-host T \
+ --fixed-range-v4 203.0.113.24/29
+
+
+