From 98460af04d626907f44ea1b13289769979ed4f7b Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Tue, 16 Jun 2015 04:56:44 +0000
Subject: Change fat neutron container into thin containers

Key difference here is the ip_wrapper.py file. This file and docker 1.7
allow for the network namespaces to be created in the host mount
namespace and propogated into the containers.

Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
Change-Id: I73bcd1c97bbaf742af883dbf281a8d76aff8aebf
---
 compose/neutron-agents.yml            | 11 -----------
 compose/neutron-dhcp-agent.yml        | 12 ++++++++++++
 compose/neutron-l3-agent.yml          | 12 ++++++++++++
 compose/neutron-linuxbridge-agent.yml | 12 ++++++++++++
 compose/neutron-metadata-agent.yml    | 12 ++++++++++++
 5 files changed, 48 insertions(+), 11 deletions(-)
 delete mode 100644 compose/neutron-agents.yml
 create mode 100644 compose/neutron-dhcp-agent.yml
 create mode 100644 compose/neutron-l3-agent.yml
 create mode 100644 compose/neutron-linuxbridge-agent.yml
 create mode 100644 compose/neutron-metadata-agent.yml

(limited to 'compose')

diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
deleted file mode 100644
index 895624dff..000000000
--- a/compose/neutron-agents.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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/neutron-dhcp-agent.yml b/compose/neutron-dhcp-agent.yml
new file mode 100644
index 000000000..8d944c00c
--- /dev/null
+++ b/compose/neutron-dhcp-agent.yml
@@ -0,0 +1,12 @@
+neutrondhcpagent:
+  image: kollaglue/centos-rdo-neutron-dhcp-agent:latest
+  name: neutron-dhcp-agent
+  net: "host"
+  privileged: true
+  restart: always
+  volumes:
+    - /run/netns/:/run/netns/:ro
+    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
+    - /lib/modules:/lib/modules:ro
+  env_file:
+   - openstack.env
diff --git a/compose/neutron-l3-agent.yml b/compose/neutron-l3-agent.yml
new file mode 100644
index 000000000..e4c31169f
--- /dev/null
+++ b/compose/neutron-l3-agent.yml
@@ -0,0 +1,12 @@
+neutronl3agent:
+  image: kollaglue/centos-rdo-neutron-l3-agent:latest
+  name: neutron-l3-agent
+  net: "host"
+  privileged: true
+  restart: always
+  volumes:
+    - /run/netns/:/run/netns/:ro
+    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
+    - /lib/modules:/lib/modules:ro
+  env_file:
+   - openstack.env
diff --git a/compose/neutron-linuxbridge-agent.yml b/compose/neutron-linuxbridge-agent.yml
new file mode 100644
index 000000000..46f2e68d5
--- /dev/null
+++ b/compose/neutron-linuxbridge-agent.yml
@@ -0,0 +1,12 @@
+neutronlinuxbridgeagent:
+  image: kollaglue/centos-rdo-neutron-linuxbridge-agent:latest
+  name: neutron-linuxbridge-agent
+  net: "host"
+  privileged: true
+  restart: always
+  volumes:
+    - /run/netns/:/run/netns/:ro
+    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
+    - /lib/modules:/lib/modules:ro
+  env_file:
+   - openstack.env
diff --git a/compose/neutron-metadata-agent.yml b/compose/neutron-metadata-agent.yml
new file mode 100644
index 000000000..b9338f7b6
--- /dev/null
+++ b/compose/neutron-metadata-agent.yml
@@ -0,0 +1,12 @@
+neutronmetadataagent:
+  image: kollaglue/centos-rdo-neutron-metadata-agent:latest
+  name: neutron-metadata-agent
+  net: "host"
+  privileged: true
+  restart: always
+  volumes:
+    - /run/netns/:/run/netns/:ro
+    - /proc/1/ns/:/opt/kolla/host_proc/1/ns/:ro
+    - /lib/modules:/lib/modules:ro
+  env_file:
+   - openstack.env
-- 
cgit v1.2.3