diff options
| author | Artur Zarzycki <azarzycki@mirantis.com> | 2016-02-23 05:20:50 -0500 |
|---|---|---|
| committer | Artur Zarzycki <azarzycki@mirantis.com> | 2016-03-08 21:29:19 +0100 |
| commit | dd298fcb9ea9dcc9138db7af8fe74431deca3d3e (patch) | |
| tree | d2ece63d6f9c08087866d1bbc7238b3de568e185 | |
| parent | 46ba928f648de37094b3030fac51da53ca099e23 (diff) | |
| download | kolla-dd298fcb9ea9dcc9138db7af8fe74431deca3d3e.tar.gz kolla-dd298fcb9ea9dcc9138db7af8fe74431deca3d3e.zip | |
Mesos DNS container
Change-Id: I07ce1b0f6a48de2a8290fac75dcf7ef07960aaf5
Implements: blueprint mesos-dns-container
| -rw-r--r-- | docker/mesos-dns/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
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') ] |