Browse code

Merge "docs: merge multiple interface sections with provider network section"

Jenkins authored on 2015/10/13 09:03:53
Showing 1 changed files
... ...
@@ -72,98 +72,6 @@ DevStack Configuration
72 72
 
73 73
 
74 74
 
75
-
76
-
77
-Using Neutron with Multiple Interfaces
78
-======================================
79
-
80
-The first interface, eth0 is used for the OpenStack management (API,
81
-message bus, etc) as well as for ssh for an administrator to access
82
-the machine.
83
-
84
-::
85
-
86
-        stack@compute:~$ ifconfig eth0
87
-        eth0      Link encap:Ethernet  HWaddr bc:16:65:20:af:fc
88
-                  inet addr:192.168.1.18
89
-
90
-eth1 is manually configured at boot to not have an IP address.
91
-Consult your operating system documentation for the appropriate
92
-technique. For Ubuntu, the contents of `/etc/network/interfaces`
93
-contains:
94
-
95
-::
96
-
97
-        auto eth1
98
-        iface eth1 inet manual
99
-                up ifconfig $IFACE 0.0.0.0 up
100
-                down ifconfig $IFACE 0.0.0.0 down
101
-
102
-The second physical interface, eth1 is added to a bridge (in this case
103
-named br-ex), which is used to forward network traffic from guest VMs.
104
-Network traffic from eth1 on the compute nodes is then NAT'd by the
105
-controller node that runs Neutron's `neutron-l3-agent` and provides L3
106
-connectivity.
107
-
108
-::
109
-
110
-        stack@compute:~$ sudo ovs-vsctl add-br br-ex
111
-        stack@compute:~$ sudo ovs-vsctl add-port br-ex eth1
112
-        stack@compute:~$ sudo ovs-vsctl show
113
-        9a25c837-32ab-45f6-b9f2-1dd888abcf0f
114
-            Bridge br-ex
115
-                Port br-ex
116
-                    Interface br-ex
117
-                        type: internal
118
-                Port phy-br-ex
119
-                    Interface phy-br-ex
120
-                        type: patch
121
-                        options: {peer=int-br-ex}
122
-                Port "eth1"
123
-                    Interface "eth1"
124
-
125
-
126
-
127
-
128
-
129
-Neutron Networking with Open vSwitch
130
-====================================
131
-
132
-Configuring neutron, OpenStack Networking in DevStack is very similar to
133
-configuring `nova-network` - many of the same configuration variables
134
-(like `FIXED_RANGE` and `FLOATING_RANGE`) used by `nova-network` are
135
-used by neutron, which is intentional.
136
-
137
-The only difference is the disabling of `nova-network` in your
138
-local.conf, and the enabling of the neutron components.
139
-
140
-
141
-Configuration
142
-
143
-::
144
-
145
-        FIXED_RANGE=10.0.0.0/24
146
-        FLOATING_RANGE=192.168.27.0/24
147
-        PUBLIC_NETWORK_GATEWAY=192.168.27.2
148
-
149
-        disable_service n-net
150
-        enable_service q-svc
151
-        enable_service q-agt
152
-        enable_service q-dhcp
153
-        enable_service q-meta
154
-        enable_service q-l3
155
-
156
-        Q_USE_SECGROUP=True
157
-        ENABLE_TENANT_VLANS=True
158
-        TENANT_VLAN_RANGE=1000:1999
159
-        PHYSICAL_NETWORK=default
160
-        OVS_PHYSICAL_BRIDGE=br-ex
161
-
162
-In this configuration we are defining FLOATING_RANGE to be a
163
-subnet that exists in the private RFC1918 address space - however in
164
-in a real setup FLOATING_RANGE would be a public IP address range.
165
-
166 75
 Neutron Networking with Open vSwitch and Provider Networks
167 76
 ==========================================================
168 77
 
... ...
@@ -206,6 +114,48 @@ Physical Network Setup
206 206
         }
207 207
 
208 208
 
209
+On a compute node, the first interface, eth0 is used for the OpenStack
210
+management (API, message bus, etc) as well as for ssh for an
211
+administrator to access the machine.
212
+
213
+::
214
+
215
+        stack@compute:~$ ifconfig eth0
216
+        eth0      Link encap:Ethernet  HWaddr bc:16:65:20:af:fc
217
+                  inet addr:10.0.0.3
218
+
219
+eth1 is manually configured at boot to not have an IP address.
220
+Consult your operating system documentation for the appropriate
221
+technique. For Ubuntu, the contents of `/etc/network/interfaces`
222
+contains:
223
+
224
+::
225
+
226
+        auto eth1
227
+        iface eth1 inet manual
228
+                up ifconfig $IFACE 0.0.0.0 up
229
+                down ifconfig $IFACE 0.0.0.0 down
230
+
231
+The second physical interface, eth1 is added to a bridge (in this case
232
+named br-ex), which is used to forward network traffic from guest VMs.
233
+
234
+::
235
+
236
+        stack@compute:~$ sudo ovs-vsctl add-br br-ex
237
+        stack@compute:~$ sudo ovs-vsctl add-port br-ex eth1
238
+        stack@compute:~$ sudo ovs-vsctl show
239
+        9a25c837-32ab-45f6-b9f2-1dd888abcf0f
240
+            Bridge br-ex
241
+                Port br-ex
242
+                    Interface br-ex
243
+                        type: internal
244
+                Port phy-br-ex
245
+                    Interface phy-br-ex
246
+                        type: patch
247
+                        options: {peer=int-br-ex}
248
+                Port "eth1"
249
+                    Interface "eth1"
250
+
209 251
 
210 252
 Service Configuration
211 253
 ---------------------