diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-24 15:28:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-24 15:28:59 +0000 |
| commit | 6766632b9ca2aa081464aebec4855c1a6c8d4163 (patch) | |
| tree | 329f03d816e34fcdbdb53697b6b7e865fef33653 /compose | |
| parent | 214ac7e6084583f703041fdfd19d67dda9417274 (diff) | |
| parent | 98460af04d626907f44ea1b13289769979ed4f7b (diff) | |
| download | kolla-6766632b9ca2aa081464aebec4855c1a6c8d4163.tar.gz kolla-6766632b9ca2aa081464aebec4855c1a6c8d4163.zip | |
Merge "Change fat neutron container into thin containers"
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 |