diff --git a/lib/nova_plugins/hypervisor-xenserver b/lib/nova_plugins/hypervisor-xenserver index 0046a366c9..67b3d76932 100644 --- a/lib/nova_plugins/hypervisor-xenserver +++ b/lib/nova_plugins/hypervisor-xenserver @@ -26,10 +26,6 @@ set +o xtrace # Allow ``build_domU.sh`` to specify the flat network bridge via kernel args FLAT_NETWORK_BRIDGE_DEFAULT=$(sed -e 's/.* flat_network_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) -if is_service_enabled neutron; then - XEN_INTEGRATION_BRIDGE_DEFAULT=$(sed -e 's/.* xen_integration_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) - XEN_INTEGRATION_BRIDGE=${XEN_INTEGRATION_BRIDGE:-$XEN_INTEGRATION_BRIDGE_DEFAULT} -fi VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1} diff --git a/tools/xen/README.md b/tools/xen/README.md index 7062ecb48c..9559e773d3 100644 --- a/tools/xen/README.md +++ b/tools/xen/README.md @@ -171,8 +171,3 @@ VM as `TEMPLATE_FILENAME`: umount "$mountdir" rm -rf "$mountdir" -### Migrate OpenStack DomU to another host - -Given you need to migrate your DomU with OpenStack installed to another host, -you need to set `XEN_INTEGRATION_BRIDGE` in localrc if neutron network is used. -It is the bridge for `XEN_INT_BRIDGE_OR_NET_NAME` network created in Dom0 diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh index d2e2c572c6..ac7af0df43 100755 --- a/tools/xen/install_os_domU.sh +++ b/tools/xen/install_os_domU.sh @@ -66,10 +66,6 @@ setup_network "$VM_BRIDGE_OR_NET_NAME" setup_network "$MGT_BRIDGE_OR_NET_NAME" setup_network "$PUB_BRIDGE_OR_NET_NAME" -# With neutron, one more network is required, which is internal to the -# hypervisor, and used by the VMs -setup_network "$XEN_INT_BRIDGE_OR_NET_NAME" - if parameter_is_specified "FLAT_NETWORK_BRIDGE"; then if [ "$(bridge_for "$VM_BRIDGE_OR_NET_NAME")" != "$(bridge_for "$FLAT_NETWORK_BRIDGE")" ]; then cat >&2 << EOF @@ -292,15 +288,9 @@ add_interface "$GUEST_NAME" "$PUB_BRIDGE_OR_NET_NAME" "$PUB_DEV_NR" # $THIS_DIR/build_xva.sh "$GUEST_NAME" -# Attach a network interface for the integration network (so that the bridge -# is created by XenServer). This is required for Neutron. Also pass that as a -# kernel parameter for DomU -attach_network "$XEN_INT_BRIDGE_OR_NET_NAME" - XEN_INTEGRATION_BRIDGE_DEFAULT=$(bridge_for "$XEN_INT_BRIDGE_OR_NET_NAME") append_kernel_cmdline \ - "$GUEST_NAME" \ - "xen_integration_bridge=${XEN_INTEGRATION_BRIDGE_DEFAULT}" + "$GUEST_NAME" FLAT_NETWORK_BRIDGE="${FLAT_NETWORK_BRIDGE:-$(bridge_for "$VM_BRIDGE_OR_NET_NAME")}" append_kernel_cmdline "$GUEST_NAME" "flat_network_bridge=${FLAT_NETWORK_BRIDGE}" diff --git a/tools/xen/xenrc b/tools/xen/xenrc index 60be02f3fe..169e0427a8 100644 --- a/tools/xen/xenrc +++ b/tools/xen/xenrc @@ -29,7 +29,6 @@ OSDOMU_VDI_GB=8 # Get the management network from the XS installation VM_BRIDGE_OR_NET_NAME="OpenStack VM Network" PUB_BRIDGE_OR_NET_NAME="OpenStack Public Network" -XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network" # VM Password GUEST_PASSWORD=${GUEST_PASSWORD:-secret}