diff options
| author | Steven Dake <stdake@cisco.com> | 2015-02-24 00:32:03 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-02-27 21:23:20 -0700 |
| commit | 7eca70b1a6dfe58288dcdeae12c99dfab69f890c (patch) | |
| tree | 0225fd19d8063ade2c6be07c1eec13dd6d97c1d4 /docker/nova-compute/nova-network | |
| parent | 8d12ee76ab5e7159b5e1d6ecb4e0cbf017924e40 (diff) | |
| download | kolla-7eca70b1a6dfe58288dcdeae12c99dfab69f890c.tar.gz kolla-7eca70b1a6dfe58288dcdeae12c99dfab69f890c.zip | |
A functional libvirt + nova_compute + nova_network
This imports sdakes' nova-docker codebase to show that atomic upgrades
work atleast with nova networking. This has many corrections.
For more details read:
http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/
Implements-blueprint: blueprint libvirt-container
Partially-implements; blueprint container-set-compute-operation-nova
Change-Id: I858ea113c5656b6da5d2fd13502fecdbd085c8da
Diffstat (limited to 'docker/nova-compute/nova-network')
| -rw-r--r-- | docker/nova-compute/nova-network/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/config-nova-network.sh | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile index 175ea0a68..79c496b96 100644 --- a/docker/nova-compute/nova-network/Dockerfile +++ b/docker/nova-compute/nova-network/Dockerfile @@ -2,7 +2,7 @@ FROM kollaglue/fedora-rdo-nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-nova-network \ - bridge-utils && yum clean all + bridge-utils initscripts && yum clean all ADD config-nova-network.sh /opt/kolla/config-nova-network.sh ADD ./start.sh /start.sh diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh index bd060b3bc..c4ca5e27e 100755 --- a/docker/nova-compute/nova-network/config-nova-network.sh +++ b/docker/nova-compute/nova-network/config-nova-network.sh @@ -2,18 +2,16 @@ . /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" +cat > /etc/sysconfig/network-scripts/ifcfg-$FLAT_INTERFACE <<EOF +DEVICE="$FLAT_INTERFACE" BOOTPROTO="none" ONBOOT="yes" DEFROUTE="yes" TYPE="Ethernet" EOF -/sbin/ifup eth1 +/usr/sbin/ifup $FLAT_INTERFACE cfg=/etc/nova/nova.conf @@ -25,6 +23,4 @@ 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 |