diff options
| author | Steven Dake <sdake@redhat.com> | 2014-10-17 13:20:17 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-10-20 14:05:03 -0700 |
| commit | 0c8080296d1d391dcfade14e08e655c094e42745 (patch) | |
| tree | 2e418d62f68ea1710d6e82d36677711f26794a90 /docker/nova-compute/nova-network | |
| parent | f2c3719506e6ec0174fe7671ae5610faccedbcb9 (diff) | |
| download | kolla-0c8080296d1d391dcfade14e08e655c094e42745.tar.gz kolla-0c8080296d1d391dcfade14e08e655c094e42745.zip | |
Change to using flat nova networking from neutron
Neutron is not yet ready, so use flat nova networking instead.
Change-Id: I4905f2a54af2c0c06cc8cf95d21f5831b02fbe5e
Diffstat (limited to 'docker/nova-compute/nova-network')
| -rw-r--r-- | docker/nova-compute/nova-network/Dockerfile | 12 | ||||
| l--------- | docker/nova-compute/nova-network/build | 1 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 8 |
3 files changed, 21 insertions, 0 deletions
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile new file mode 100644 index 000000000..135c03f4f --- /dev/null +++ b/docker/nova-compute/nova-network/Dockerfile @@ -0,0 +1,12 @@ +FROM kollaglue/fedora-rdo-nova-base +MAINTAINER Steven Dake <sdake@redhat.com> + +RUN yum -y install openstack-nova-network \ + ; yum clean all + +ADD ./start.sh /start.sh + +VOLUME [ "/var/lib/nova" ] +VOLUME [ "/var/lib/libvirt" ] + +CMD ["/start.sh"] diff --git a/docker/nova-compute/nova-network/build b/docker/nova-compute/nova-network/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/nova-compute/nova-network/build @@ -0,0 +1 @@ +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh new file mode 100755 index 000000000..a925cefc9 --- /dev/null +++ b/docker/nova-compute/nova-network/start.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +. /opt/kolla/config-common.sh +. /opt/kolla/config-nova.sh + +exec /usr/bin/nova-network |