From 7eca70b1a6dfe58288dcdeae12c99dfab69f890c Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 24 Feb 2015 00:32:03 -0700 Subject: 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 --- docker/nova-compute/nova-network/Dockerfile | 2 +- docker/nova-compute/nova-network/config-nova-network.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'docker/nova-compute/nova-network') 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 < /etc/sysconfig/network-scripts/ifcfg-$FLAT_INTERFACE <