From ed107a5e26f35351a178c12eed5cd38c086409db Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Tue, 7 Apr 2015 19:34:40 +0000
Subject: Adds Neutron Agents Support

Previously, the agents ran in seperate containers. Since some of
the agents create and use network namespaces, runnning them in
seperate containers has become a challenge. This patch adds
neutron agent support in a single container.

Partially Implements: blueprint compute-operation-neutron

Change-Id: If4f893abd50d90b58e8435ec2659870dce36951c
---
 compose/linux-bridge.yml   |  7 -------
 compose/neutron-agents.yml | 11 +++++++++++
 compose/nova-compute.yml   | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 7 deletions(-)
 delete mode 100644 compose/linux-bridge.yml
 create mode 100644 compose/neutron-agents.yml
 create mode 100644 compose/nova-compute.yml

(limited to 'compose')

diff --git a/compose/linux-bridge.yml b/compose/linux-bridge.yml
deleted file mode 100644
index 75f27f8df..000000000
--- a/compose/linux-bridge.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-linuxbridge:
-  image: kollaglue/centos-rdo-linux-bridge
-  name: neutron-linuxbridge-agent
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
new file mode 100644
index 000000000..971dad720
--- /dev/null
+++ b/compose/neutron-agents.yml
@@ -0,0 +1,11 @@
+neutronagents:
+  image: kollaglue/centos-rdo-neutron-agents:latest
+  name: neutron-agents
+  net: "host"
+  privileged: true
+ restart: always
+  volumes:
+    - /var/run/netns/:/var/run/netns/
+    - /lib/modules:/lib/modules:ro
+  env_file:
+   - openstack.env
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
new file mode 100644
index 000000000..87e7e4ad6
--- /dev/null
+++ b/compose/nova-compute.yml
@@ -0,0 +1,38 @@
+computedata:
+   image: kollaglue/centos-rdo-nova-compute-data
+   name: computedata
+
+libvirt:
+   image: kollaglue/centos-rdo-nova-libvirt
+   name: libvirt
+   net: host
+   pid: host
+   privileged: true
+   restart: always
+   env_file:
+    - openstack.env
+   volumes:
+    - /run:/run
+    - /sys/fs/cgroup:/sys/fs/cgroup
+    - /var/lib/nova:/var/lib/nova
+    - /var/lib/libvirt:/var/lib/libvirt
+    - /etc/libvirt/qemu:/etc/libvirt/qemu
+   volumes_from:
+    - computedata
+
+novacompute:
+   image: kollaglue/centos-rdo-nova-compute
+   name: nova-compute
+   net: host
+   privileged: true
+   restart: always
+   env_file:
+    - openstack.env
+   volumes:
+    - /run:/run
+    - /sys/fs/cgroup:/sys/fs/cgroup
+    - /var/lib/nova:/var/lib/nova
+    - /var/lib/libvirt:/var/lib/libvirt
+    - /etc/libvirt/qemu:/etc/libvirt/qemu
+   volumes_from:
+    - computedata
-- 
cgit v1.2.3