diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-14 12:33:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-14 12:33:18 +0000 |
| commit | c09db422cf4eddbde5d4ce395cc1b7ce5eeac670 (patch) | |
| tree | 22cc5f8f3724ee504fafb32c166a5995d48971e4 | |
| parent | ba6ea72a3737716e709e69d7224edc03b7c3f853 (diff) | |
| parent | dd298fcb9ea9dcc9138db7af8fe74431deca3d3e (diff) | |
| download | kolla-c09db422cf4eddbde5d4ce395cc1b7ce5eeac670.tar.gz kolla-c09db422cf4eddbde5d4ce395cc1b7ce5eeac670.zip | |
Merge "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 2c6ec6714..cc2b56d83 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') ] |