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/marathon/Dockerfile.j2          | 57 ----------------------------------
 docker/marathon/java8-runtime-headless |  9 ------
 docker/marathon/openjdk.list           |  2 --
 3 files changed, 68 deletions(-)
 delete mode 100644 docker/marathon/Dockerfile.j2
 delete mode 100644 docker/marathon/java8-runtime-headless
 delete mode 100644 docker/marathon/openjdk.list

(limited to 'docker/marathon')

diff --git a/docker/marathon/Dockerfile.j2 b/docker/marathon/Dockerfile.j2
deleted file mode 100644
index 042a6288b..000000000
--- a/docker/marathon/Dockerfile.j2
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}mesos-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        marathon \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-COPY openjdk.list /etc/apt/sources.list.d/openjdk.list
-
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv DA1A4A13543B466853BAF164EB9B1D8886F44E2A \
-    && apt-get update
-
-# NOTE(nihilifer): Marathon package for Ubuntu depends on Oracle Java and
-# there is no official way to use OpenJDK. There is no way to accept the
-# license in kolla. That's why the fake package is created here and OpenJDK
-# is used anyway.
-# We only have to do this with Ubuntu - CentOS packages don't depend strictly
-# on Oracle JDK and installing them by yum just installs OpenJDK as a
-# dependency.
-
-RUN apt-get install -y --no-install-recommends \
-        equivs \
-        gcc \
-    && apt-get clean
-
-COPY java8-runtime-headless /
-
-RUN equivs-build java8-runtime-headless \
-    && dpkg -i java8-runtime-headless_42_all.deb \
-    && rm java8-runtime-headless java8-runtime-headless_42_all.deb
-
-# NOTE(ajafo) Installation of Marathon/OpenJDK breaks cacerts file,
-# so the ca-certificates-java package is purged
-# and installed again as a workaround for this problem.
-
-RUN apt-get install -y --no-install-recommends \
-        marathon \
-        openjdk-8-jre-headless \
-    && dpkg --purge --force-depends ca-certificates-java \
-    && apt-get install -y --no-install-recommends \
-        ca-certificates-java \
-    && apt-get clean
-
-{% endif %}
-
-RUN useradd --user-group marathon \
-    && chmod 755 /usr/bin/marathon
-
-CMD ["marathon", "--no-logger"]
-
-{{ include_footer }}
-
-USER marathon
diff --git a/docker/marathon/java8-runtime-headless b/docker/marathon/java8-runtime-headless
deleted file mode 100644
index 5c24a9339..000000000
--- a/docker/marathon/java8-runtime-headless
+++ /dev/null
@@ -1,9 +0,0 @@
-Section: misc
-Priority: optional
-Standards-Version: 3.9.2
-
-Package: java8-runtime-headless
-Version: 1:42
-Maintainer: Kolla Project (https://launchpad.net/kolla)
-Architecture: all
-Description: fake Oracle Java package to block a non-free dependency
diff --git a/docker/marathon/openjdk.list b/docker/marathon/openjdk.list
deleted file mode 100644
index e1fa60ad4..000000000
--- a/docker/marathon/openjdk.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# OpenJDK 8 repo
-deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main
-- 
cgit v1.2.3