From fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Tue, 3 May 2016 08:35:22 -0400
Subject: Cleanup Mesos/Marathon related work

We got rid of the kolla-mesos repo:
http://git.openstack.org/cgit/openstack/kolla-mesos/tree/README.rst

So we don't need things in the main kolla tree
related to Mesos/Marathon

Closes-Bug: #1577951
Change-Id: Iafae63914c8a6601dc1b5b04231af8a1d2cc8642
---
 docker/chronos/Dockerfile.j2 | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 docker/chronos/Dockerfile.j2

(limited to 'docker/chronos')

diff --git a/docker/chronos/Dockerfile.j2 b/docker/chronos/Dockerfile.j2
deleted file mode 100644
index 05a456fcf..000000000
--- a/docker/chronos/Dockerfile.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mesos-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        chronos \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends \
-        chronos \
-    && apt-get clean
-
-{% endif %}
-
-RUN useradd --user-group chronos
-
-CMD chronos run_jar --http_port $CHRONOS_HTTP_PORT --master $CHRONOS_MASTER --zk_hosts $CHRONOS_ZK_HOSTS
-
-{{ include_footer }}
-
-USER chronos
-- 
cgit v1.2.3