aboutsummaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-02 20:36:27 -0700
committerSteven Dake <stdake@cisco.com>2015-05-11 09:26:02 -0700
commit5a06901664cd8d3bb326d9e731e7dd82eec54f35 (patch)
treecb7093a8f2f19db134c9ac4350f62f9b8351383c /compose
parent56e72a6bcf1f06081d5513c79080436001c2afcc (diff)
downloadkolla-5a06901664cd8d3bb326d9e731e7dd82eec54f35.tar.gz
kolla-5a06901664cd8d3bb326d9e731e7dd82eec54f35.zip
Add Magnum Containers as a Service to Kolla
This adds Magnum Containers as a Service to Kolla. Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24 Implements-blueprint: container-magnum
Diffstat (limited to 'compose')
-rw-r--r--compose/magnum-api-conductor.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/compose/magnum-api-conductor.yml b/compose/magnum-api-conductor.yml
new file mode 100644
index 000000000..b7da90ef4
--- /dev/null
+++ b/compose/magnum-api-conductor.yml
@@ -0,0 +1,14 @@
+magnumapi:
+ image: kollaglue/centos-rdo-magnum-api:kilo
+ name: magnum-api
+ net: "host"
+ restart: always
+ env_file:
+ - openstack.env
+magnumconductor:
+ image: kollaglue/centos-rdo-magnum-conductor:kilo
+ name: magnum-conductor
+ net: "host"
+ restart: always
+ env_file:
+ - openstack.env