From 05f352a12556e08ecf10155399b29360c491b76e Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Sat, 25 Oct 2014 03:53:36 +0000 Subject: Adds support for Functional Nova-Network Previously, the nova-network service was not fully functional. This patch adds multi-interface support to the nova-network container. The eth0 configuration is moved to a bridge (br100 per nova defaults), and configures eth0 and eth1 as bridged interfaces. eth0 is used for the nova-flat network and eth1 for foating-ip's. This model is identical to typical bare-metal nova-network deployments. The patch depends on the following patch to kube-heat template that provides multiple interfaces per minion: https://github.com/larsks/heat-kubernetes/pull/8 Rebased. Fixed merge conflict with k8s/pod/nova-compute-pod.yaml Change-Id: Ieb59f397981a226555ce55ca621ef578b987e3c6 --- docker/nova-compute/nova-network/Dockerfile | 1 + .../nova-network/config-nova-network.sh | 30 ++++++++++++++++++++++ docker/nova-compute/nova-network/start.sh | 11 ++------ 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100755 docker/nova-compute/nova-network/config-nova-network.sh (limited to 'docker/nova-compute') diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile index fef8bb379..175ea0a68 100644 --- a/docker/nova-compute/nova-network/Dockerfile +++ b/docker/nova-compute/nova-network/Dockerfile @@ -4,6 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-nova-network \ bridge-utils && yum clean all +ADD config-nova-network.sh /opt/kolla/config-nova-network.sh ADD ./start.sh /start.sh VOLUME [ "/var/lib/nova" ] diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh new file mode 100755 index 000000000..bd060b3bc --- /dev/null +++ b/docker/nova-compute/nova-network/config-nova-network.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +. /opt/kolla/config-nova.sh + +check_required_vars CONFIG_NETWORK + +# Configure eth1 as a physcial interface for nova flat network +cat > /etc/sysconfig/network-scripts/ifcfg-eth1 <