aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/mesos-dns/Dockerfile.j27
-rw-r--r--kolla/common/config.py4
2 files changed, 9 insertions, 2 deletions
diff --git a/docker/mesos-dns/Dockerfile.j2 b/docker/mesos-dns/Dockerfile.j2
new file mode 100644
index 000000000..4576cf02b
--- /dev/null
+++ b/docker/mesos-dns/Dockerfile.j2
@@ -0,0 +1,7 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+RUN curl -o /usr/local/bin/mesos-dns -L https://github.com/mesosphere/mesos-dns/releases/download/v0.5.1/mesos-dns-v0.5.1-linux-amd64 \
+ && chmod +x /usr/local/bin/mesos-dns
+
+{{ include_footer }}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 2eeb8c9ca..40aa82ec3 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -50,8 +50,8 @@ _PROFILE_OPTS = [
'nova', 'openvswitch', 'rabbitmq', 'heka'],
help='Gate images'),
cfg.ListOpt('mesos',
- default=['chronos', 'marathon', 'mesos-master', 'mesos-slave',
- 'zookeeper'],
+ default=['chronos', 'marathon', 'mesos-dns', 'mesos-master',
+ 'mesos-slave', 'zookeeper'],
help='Mesos images')
]