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/mesosphere/mesosphere-base/Dockerfile.j2   | 17 -----------------
 docker/mesosphere/mesosphere-base/mesosphere.list |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 docker/mesosphere/mesosphere-base/Dockerfile.j2
 delete mode 100644 docker/mesosphere/mesosphere-base/mesosphere.list

(limited to 'docker/mesosphere')

diff --git a/docker/mesosphere/mesosphere-base/Dockerfile.j2 b/docker/mesosphere/mesosphere-base/Dockerfile.j2
deleted file mode 100644
index b3bb57d65..000000000
--- a/docker/mesosphere/mesosphere-base/Dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN rpm --import http://repos.mesosphere.io/el/RPM-GPG-KEY-mesosphere
-
-RUN rpm -Uvh http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-COPY mesosphere.list /etc/apt/sources.list.d/mesosphere.list
-
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 81026D0004C44CF7EF55ADF8DF7D54CBE56151BF \
-    && apt-get update
-
-{% endif %}
diff --git a/docker/mesosphere/mesosphere-base/mesosphere.list b/docker/mesosphere/mesosphere-base/mesosphere.list
deleted file mode 100644
index 54b7b1d77..000000000
--- a/docker/mesosphere/mesosphere-base/mesosphere.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# Mesosphere repo
-deb http://repos.mesosphere.com/ubuntu trusty main
-- 
cgit v1.2.3