From b112b46611bf90857acead4fbacacae48ab1e8cd Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Mon, 30 Sep 2013 19:24:07 +0400 Subject: [PATCH] Remove use of fixed_range from docs fixed_range in nova.conf was deprecated in Grizzly and has been removed in Havana. Change-Id: I663ab54260ab7a6041b951598b901cf95a259df3 Closes-Bug: 1207559 --- doc/admin-guide-cloud/ch_compute.xml | 59 ++++++++----------- doc/common/samples/nova.conf | 1 - .../section_compute-configure-ipv6.xml | 4 +- .../section_compute-config-guest-network.xml | 2 +- .../section_compute-minimum-configuration.xml | 1 - 5 files changed, 26 insertions(+), 41 deletions(-) diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml index 2ec4161a21..8d62ee6160 100644 --- a/doc/admin-guide-cloud/ch_compute.xml +++ b/doc/admin-guide-cloud/ch_compute.xml @@ -988,42 +988,29 @@ header: Date: Thu, 13 Sep 2012 20:27:36 GMT role="italic">not assigned to any of the host's network interfaces, only to the VM's guest-side interface. - - In any setup with flat networking, the host(-s) with - nova-network on it is (are) responsible for forwarding - traffic from the private network. Compute can - determine the NAT entries for each network when you - have fixed_range='' in your - nova.conf. Sometimes NAT is - not used, such as when fixed_range is configured with - all public IPs and a hardware router is used (one of - the HA options). Such host(-s) needs to have - br100 configured and physically - connected to any other nodes that are hosting VMs. You - must set the flat_network_bridge - option or create networks with the bridge parameter in - order to avoid raising an error. Compute nodes have - iptables/ebtables entries created for each project and - instance to protect against IP/MAC address spoofing - and ARP poisoning. - To use the new dynamic - fixed_range setup in - Grizzly, set fixed_range='' - in your nova.conf. For - backwards compatibility, Grizzly supports the - fixed_range option, - which performs the default logic from Folsom - and earlier releases. - - - In single-host Flat DHCP mode you will be able to ping - VMs through their fixed IP from the nova-network - node, but you cannot ping them from the compute - nodes. This is expected behavior. - - + In any setup with flat networking, the host(-s) with + nova-network on it is (are) responsible for forwarding + traffic from the private network. Compute can determine + the NAT entries for each network, though sometimes NAT is not + used, such as when configured with all + public IPs or a hardware router is used (one of the HA + options). Such host(-s) needs to have + br100 configured and physically + connected to any other nodes that are hosting VMs. You + must set the flat_network_bridge option + or create networks with the bridge parameter in order to + avoid raising an error. Compute nodes have + iptables/ebtables entries created for each project and instance + to protect against IP/MAC address spoofing and ARP + poisoning. + + In single-host Flat DHCP mode you will be able to ping VMs + through their fixed IP from the nova-network node, but + you cannot ping them + from the compute nodes. This is + expected behavior. + VLAN Network Mode is the default mode for OpenStack Compute. In this mode, Compute creates a VLAN and bridge for each diff --git a/doc/common/samples/nova.conf b/doc/common/samples/nova.conf index 9c10d893fa..530ca24128 100644 --- a/doc/common/samples/nova.conf +++ b/doc/common/samples/nova.conf @@ -46,7 +46,6 @@ public_interface=eth0 vlan_interface=eth0 flat_network_bridge=br100 flat_interface=eth0 -fixed_range='' # NOVNC CONSOLE novncproxy_base_url=http://192.168.206.130:6080/vnc_auto.html diff --git a/doc/config-reference/compute/section_compute-configure-ipv6.xml b/doc/config-reference/compute/section_compute-configure-ipv6.xml index 14c9a535aa..3b71f830b4 100644 --- a/doc/config-reference/compute/section_compute-configure-ipv6.xml +++ b/doc/config-reference/compute/section_compute-configure-ipv6.xml @@ -5,7 +5,7 @@ xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" - xmlns:ns="http://docbook.org/ns/docbook"> + xmlns:ns="http://docbook.org/ns/docbook" version="5.0"> Configuring Compute to use IPv6 Addresses You can configure Compute to use both IPv4 and IPv6 addresses for communication by putting it into a IPv4/IPv6 dual stack mode. In IPv4/IPv6 @@ -41,7 +41,7 @@ When using the command nova network-create you can add a fixed range for IPv6 addresses. You must specify public or private after the create parameter. - $ nova network-create public --fixed-range-v4 fixed_range --vlan vlan_id --vpn vpn_start --fixed-range-v6 fixed_range_v6 + $ nova network-create public --fixed-range-v4 fixed_range_v4 --vlan vlan_id --vpn vpn_start --fixed-range-v6 fixed_range_v6 You can set IPv6 global routing prefix by using the --fixed_range_v6 parameter. The default is: fd00::/48. When you use diff --git a/doc/install-guide/section_compute-config-guest-network.xml b/doc/install-guide/section_compute-config-guest-network.xml index 9efadd61bf..21326a0b35 100644 --- a/doc/install-guide/section_compute-config-guest-network.xml +++ b/doc/install-guide/section_compute-config-guest-network.xml @@ -13,7 +13,7 @@ root:# ip link set eth0 promisc on Set up your /etc/network/interfaces file with these settings: eth0: public IP, gateway - br100: no ports, stp off, fd 0, first address from fixed_range set in nova.conf files. + br100: no ports, stp off, fd 0, first address from your defined network range. Here's an Ubuntu/Debian example: # The loopback network interface auto lo diff --git a/doc/install-guide/section_compute-minimum-configuration.xml b/doc/install-guide/section_compute-minimum-configuration.xml index bc4ce30c4c..8496acd3ba 100644 --- a/doc/install-guide/section_compute-minimum-configuration.xml +++ b/doc/install-guide/section_compute-minimum-configuration.xml @@ -78,7 +78,6 @@ >the reference in the OpenStack Configuration Reference. auth_strategy=keystone network_manager=nova.network.manager.FlatDHCPManager -fixed_range=192.168.100.0/24 public_interface=eth0 flat_interface=eth0 flat_network_bridge=br100