openstack
/
openstack-ansible
Code Issues Proposed changes

Ensure LXC bridge exists, is up, and has rules 

Additional check to ensure the lxc bridge interface exists added when
starting networks. Additional edge cases in the bridge being created
and the interface made usable are tested and resolved when they fail.

In addition dnsmasq is only kicked when the container network is
modified.

Co-Authored-By: Kevin Carter <kevin.carter@rackspace.com>
Change-Id: I7350626bd736f815bd2a9ed0d4949d42cd5db9af
Closes-Bug: 1438374
This commit is contained in:
Steve Lewis 2015-03-30 13:07:23 -07:00 committed by git-harry
parent 2d4f9c750f
commit 5aa09d5afe
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
playbooks/roles/lxc_hosts/templates/lxc-system-manage.j2
View File

@ -178,28 +178,34 @@ function stop_containers_with_fire() {
function start_networks() {
set -e
info "Building the LXC container network."
if [ -f "/sys/class/net/${LXC_BRIDGE}/bridge/bridge_id" ];then
success "LXC container network is already online."
else
if [ ! "$(ifup ${LXC_BRIDGE})" ];then
info "Building the LXC container network."
# Create lxc bridge
brctl addbr "${LXC_BRIDGE}"
# Create lxc bridge
brctl addbr "${LXC_BRIDGE}" || true
# Set the lxc bridge up
ip link set "${LXC_BRIDGE}" up || true
# Set the lxc bridge up
ip link set "${LXC_BRIDGE}" up || true
# Assign an address to the lxc bridge
ip addr add "${LXC_ADDR}"/"${LXC_NETMASK}" dev "${LXC_BRIDGE}"
# Assign an address to the lxc bridge
ip addr add "${LXC_ADDR}"/"${LXC_NETMASK}" dev "${LXC_BRIDGE}"
add_rules
add_rules
LXC_DOMAIN_ARG=""
if [ -n "$LXC_DOMAIN" ]; then
LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
LXC_DOMAIN_ARG=""
if [ -n "$LXC_DOMAIN" ]; then
LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
fi
# Start DNS mask
DHCP_LEASE_FILE="/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases"
start_dnsmasq
success "LXC container network has been created."
fi
fi
# Start DNS mask
DHCP_LEASE_FILE="/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases"
start_dnsmasq
success "LXC container network has been created."
}
function stop_dnsmasq() {