openstack/devstack
Code Issues Proposed changes

Set default value and configurable value for integration bridge

Browse Source 
When using XenServer as hypervisor, install_os_domU.sh will create
integration bridge for compute node when neutron network is used.
But it should provide a way to allow moving of the VM to another
host (with a different XEN_INTEGRATION_BRIDGE) for easier install.
This patch is to provide the way to let user have the chance to
configure integration bridge themselves

Change-Id: If923a5e978e77fc091d24b6e1fe7a83a3375da09
This commit is contained in:
Huan Xie 2016-04-19 07:01:30 +01:00
parent d55b83f824
commit bea1e1954a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nova_plugins/hypervisor-xenserver
View File

@ -29,7 +29,8 @@ GUEST_INTERFACE_DEFAULT=eth1
# Allow ``build_domU.sh`` to specify the flat network bridge via kernel args # 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) FLAT_NETWORK_BRIDGE_DEFAULT=$(sed -e 's/.* flat_network_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline)
if is_service_enabled neutron; then if is_service_enabled neutron; then
XEN_INTEGRATION_BRIDGE=$(sed -e 's/.* xen_integration_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) 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 fi
VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1} VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1}

6
tools/xen/README.md
View File

@ -170,3 +170,9 @@ VM as `TEMPLATE_FILENAME`:
xe vm-import filename="$mountdir/$TEMPLATE_FILENAME" xe vm-import filename="$mountdir/$TEMPLATE_FILENAME"
umount "$mountdir" umount "$mountdir"
rm -rf "$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

4
tools/xen/install_os_domU.sh
View File

@ -299,10 +299,10 @@ $THIS_DIR/build_xva.sh "$GUEST_NAME"
# kernel parameter for DomU # kernel parameter for DomU
attach_network "$XEN_INT_BRIDGE_OR_NET_NAME" attach_network "$XEN_INT_BRIDGE_OR_NET_NAME"
XEN_INTEGRATION_BRIDGE=$(bridge_for "$XEN_INT_BRIDGE_OR_NET_NAME") XEN_INTEGRATION_BRIDGE_DEFAULT=$(bridge_for "$XEN_INT_BRIDGE_OR_NET_NAME")
append_kernel_cmdline \ append_kernel_cmdline \
"$GUEST_NAME" \ "$GUEST_NAME" \
"xen_integration_bridge=${XEN_INTEGRATION_BRIDGE}" "xen_integration_bridge=${XEN_INTEGRATION_BRIDGE_DEFAULT}"
FLAT_NETWORK_BRIDGE="${FLAT_NETWORK_BRIDGE:-$(bridge_for "$VM_BRIDGE_OR_NET_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}" append_kernel_cmdline "$GUEST_NAME" "flat_network_bridge=${FLAT_NETWORK_BRIDGE}"