diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-21 21:44:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-21 21:44:28 +0000 |
| commit | 1520f41a653b947817bbe2ca9c8910fb11ed538b (patch) | |
| tree | 9a3a82dab7fc31152a3cc400f6240798f0fe0c5a /docker/nova-compute/nova-network | |
| parent | 3c803b62be267c06fce3379bc280b5d06fdee778 (diff) | |
| parent | 05f352a12556e08ecf10155399b29360c491b76e (diff) | |
| download | kolla-1520f41a653b947817bbe2ca9c8910fb11ed538b.tar.gz kolla-1520f41a653b947817bbe2ca9c8910fb11ed538b.zip | |
Merge "Adds support for Functional Nova-Network"
Diffstat (limited to 'docker/nova-compute/nova-network')
| -rw-r--r-- | docker/nova-compute/nova-network/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/config-nova-network.sh | 30 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 11 |
3 files changed, 33 insertions, 9 deletions
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 <<EOF +DEVICE="eth1" +BOOTPROTO="none" +ONBOOT="yes" +DEFROUTE="yes" +TYPE="Ethernet" +EOF + +/sbin/ifup eth1 + +cfg=/etc/nova/nova.conf + +crudini --set $cfg DEFAULT network_manager nova.network.manager.FlatDHCPManager +crudini --set $cfg DEFAULT firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver +crudini --set $cfg DEFAULT network_size 254 +crudini --set $cfg DEFAULT allow_same_net_traffic False +crudini --set $cfg DEFAULT multi_host True +crudini --set $cfg DEFAULT send_arp_for_ha True +crudini --set $cfg DEFAULT share_dhcp_address True +crudini --set $cfg DEFAULT force_dhcp_release True +crudini --set $cfg DEFAULT flat_interface eth1 +crudini --set $cfg DEFAULT flat_network_bridge br100 +crudini --set $cfg DEFAULT public_interface eth0 diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh index 53d072b3f..b5fc89f85 100755 --- a/docker/nova-compute/nova-network/start.sh +++ b/docker/nova-compute/nova-network/start.sh @@ -2,14 +2,7 @@ set -e -. /opt/kolla/config-nova.sh - -/usr/sbin/brctl addbr br100 -ip link set br100 up - -# This is a dummy interface -ip link add flat0 type veth peer name flat1 -ip link set flat0 up -ip link set flat1 up +. /opt/kolla/config-nova-network.sh +# Start nova-network exec /usr/bin/nova-network |
