Previously we use a specific integration bridge for neutron ovs agent
which is running in compute node, but this isn't necessary, this
patch is to remove the specific integration bridge for XenSever and
remove the custom integration bridge definition
Depends-On: I675565e1ea6c887d40d7a53f62968c4aa385ecca
Change-Id: If5886e3711765a97f40f20e478f958b988b5a620
... | ... |
@@ -26,10 +26,6 @@ set +o xtrace |
26 | 26 |
|
27 | 27 |
# Allow ``build_domU.sh`` to specify the flat network bridge via kernel args |
28 | 28 |
FLAT_NETWORK_BRIDGE_DEFAULT=$(sed -e 's/.* flat_network_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) |
29 |
-if is_service_enabled neutron; then |
|
30 |
- XEN_INTEGRATION_BRIDGE_DEFAULT=$(sed -e 's/.* xen_integration_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) |
|
31 |
- XEN_INTEGRATION_BRIDGE=${XEN_INTEGRATION_BRIDGE:-$XEN_INTEGRATION_BRIDGE_DEFAULT} |
|
32 |
-fi |
|
33 | 29 |
|
34 | 30 |
VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1} |
35 | 31 |
|
... | ... |
@@ -171,8 +171,3 @@ VM as `TEMPLATE_FILENAME`: |
171 | 171 |
umount "$mountdir" |
172 | 172 |
rm -rf "$mountdir" |
173 | 173 |
|
174 |
-### Migrate OpenStack DomU to another host |
|
175 |
- |
|
176 |
-Given you need to migrate your DomU with OpenStack installed to another host, |
|
177 |
-you need to set `XEN_INTEGRATION_BRIDGE` in localrc if neutron network is used. |
|
178 |
-It is the bridge for `XEN_INT_BRIDGE_OR_NET_NAME` network created in Dom0 |
... | ... |
@@ -66,10 +66,6 @@ setup_network "$VM_BRIDGE_OR_NET_NAME" |
66 | 66 |
setup_network "$MGT_BRIDGE_OR_NET_NAME" |
67 | 67 |
setup_network "$PUB_BRIDGE_OR_NET_NAME" |
68 | 68 |
|
69 |
-# With neutron, one more network is required, which is internal to the |
|
70 |
-# hypervisor, and used by the VMs |
|
71 |
-setup_network "$XEN_INT_BRIDGE_OR_NET_NAME" |
|
72 |
- |
|
73 | 69 |
if parameter_is_specified "FLAT_NETWORK_BRIDGE"; then |
74 | 70 |
if [ "$(bridge_for "$VM_BRIDGE_OR_NET_NAME")" != "$(bridge_for "$FLAT_NETWORK_BRIDGE")" ]; then |
75 | 71 |
cat >&2 << EOF |
... | ... |
@@ -292,15 +288,9 @@ add_interface "$GUEST_NAME" "$PUB_BRIDGE_OR_NET_NAME" "$PUB_DEV_NR" |
292 | 292 |
# |
293 | 293 |
$THIS_DIR/build_xva.sh "$GUEST_NAME" |
294 | 294 |
|
295 |
-# Attach a network interface for the integration network (so that the bridge |
|
296 |
-# is created by XenServer). This is required for Neutron. Also pass that as a |
|
297 |
-# kernel parameter for DomU |
|
298 |
-attach_network "$XEN_INT_BRIDGE_OR_NET_NAME" |
|
299 |
- |
|
300 | 295 |
XEN_INTEGRATION_BRIDGE_DEFAULT=$(bridge_for "$XEN_INT_BRIDGE_OR_NET_NAME") |
301 | 296 |
append_kernel_cmdline \ |
302 |
- "$GUEST_NAME" \ |
|
303 |
- "xen_integration_bridge=${XEN_INTEGRATION_BRIDGE_DEFAULT}" |
|
297 |
+ "$GUEST_NAME" |
|
304 | 298 |
|
305 | 299 |
FLAT_NETWORK_BRIDGE="${FLAT_NETWORK_BRIDGE:-$(bridge_for "$VM_BRIDGE_OR_NET_NAME")}" |
306 | 300 |
append_kernel_cmdline "$GUEST_NAME" "flat_network_bridge=${FLAT_NETWORK_BRIDGE}" |
... | ... |
@@ -29,7 +29,6 @@ OSDOMU_VDI_GB=8 |
29 | 29 |
# Get the management network from the XS installation |
30 | 30 |
VM_BRIDGE_OR_NET_NAME="OpenStack VM Network" |
31 | 31 |
PUB_BRIDGE_OR_NET_NAME="OpenStack Public Network" |
32 |
-XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network" |
|
33 | 32 |
|
34 | 33 |
# VM Password |
35 | 34 |
GUEST_PASSWORD=${GUEST_PASSWORD:-secret} |