4 files changed, 0 insertions, 89 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d7048f076..1dd20b42b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -76,7 +76,6 @@ COPY yum.conf /etc/yum.conf
 {% if base_arch == 'x86_64' %}
     {% set base_yum_repo_files = [
         'ceph.repo',
-        'crane.repo',
         'elasticsearch.repo',
         'grafana.repo',
         'influxdb.repo',
diff --git a/docker/base/crane.repo b/docker/base/crane.repo
deleted file mode 100644
index 55d7084d7..000000000
--- a/docker/base/crane.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-# TODO(mandre) Remove when crane is in centos repos
-# NOTE python-crane package is not signed
-[pulp-2-testing]
-name=Pulp 2 Testing
-baseurl=https://repos.fedorapeople.org/pulp/pulp/testing/automation/2-master/stage/7Server/$basearch/
-enabled=1
-gpgcheck=0
diff --git a/docker/crane/Dockerfile.j2 b/docker/crane/Dockerfile.j2
deleted file mode 100644
index dfb8fe9eb..000000000
--- a/docker/crane/Dockerfile.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block crane_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'rhel'] %}
-
-        {% set crane_packages = [
-                'httpd',
-                'mod_ssl',
-                'mod_wsgi',
-                'mod_xsendfile',
-                'python-crane'
-        ] %}
-
-{{ macros.install_packages(crane_packages | customizable("packages")) }}
-
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-
-    {% else %}
-RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set crane_packages = [
-                'httpd',
-                'mod_ssl',
-                'mod_wsgi',
-                'mod_xsendfile',
-                'python-flask'
-        ] %}
-
-{{ macros.install_packages(crane_packages | customizable("packages")) }}
-
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-
-    {% elif base_package_type == 'deb' %}
-RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-{% block crane_source_install_python_pip %}
-{{ macros.get_pip() }}
-{% endblock %}
-
-ADD crane-archive /crane-source
-
-{% set crane_pip_packages = [
-    '/crane'
-] %}
-
-RUN ln -s crane-source/* crane \
-    && {{ macros.install_pip(crane_pip_packages | customizable("pip_packages"), constraints=false) }}
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block crane_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/crane/extend_start.sh b/docker/crane/extend_start.sh
deleted file mode 100644
index 1277bea35..000000000
--- a/docker/crane/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Assume the service runs on top of Apache when user is root
-if [[ "$(whoami)" == 'root' ]]; then
-    # NOTE(pbourke): httpd will not clean up after itself in some cases which
-    # results in the container not being able to restart. (bug #1489676, 1557036)
-    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
-        # Loading Apache2 ENV variables
-        . /etc/apache2/envvars
-        install -d /var/run/apache2/
-        rm -rf /var/run/apache2/*
-    else
-        rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
-    fi
-fi