diff options
| author | Sam Yaple <sam@yaple.net> | 2015-06-16 04:56:44 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-06-24 14:41:23 +0000 |
| commit | 98460af04d626907f44ea1b13289769979ed4f7b (patch) | |
| tree | 66acd0b33a60643fa84199c31250dc12ad518478 /compose | |
| parent | 2336ba39d49b9a463ce627b1a8dbc3f3f866252d (diff) | |
| download | kolla-98460af04d626907f44ea1b13289769979ed4f7b.tar.gz kolla-98460af04d626907f44ea1b13289769979ed4f7b.zip | |
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
Diffstat (limited to 'compose')
| -rw-r--r-- | compose/neutron-agents.yml | 11 | ||||
| -rw-r--r-- | compose/neutron-dhcp-agent.yml | 12 | ||||
| -rw-r--r-- | compose/neutron-l3-agent.yml | 12 | ||||
| -rw-r--r-- | compose/neutron-linuxbridge-agent.yml | 12 | ||||
| -rw-r--r-- | compose/neutron-metadata-agent.yml | 12 |
5 files changed, 48 insertions, 11 deletions
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 |