diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/crane.repo | 7 | ||||
| -rw-r--r-- | docker/crane/Dockerfile.j2 | 66 | ||||
| -rw-r--r-- | docker/crane/extend_start.sh | 15 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 | ||||
| -rw-r--r-- | releasenotes/notes/remove-crane-ad12c12b633d4d73.yaml | 5 | ||||
| -rwxr-xr-x | tools/version-check.py | 1 |
8 files changed, 5 insertions, 99 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 065a5bf8f..fdb4655e8 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -338,10 +338,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/cloudkitty/' 'cloudkitty-master.tar.gz')}, - 'crane': { - 'type': 'git', - 'reference': 'master', - 'location': ('https://github.com/pulp/crane.git')}, 'cyborg-base': { 'type': 'url', 'location': ('$tarballs_base/cyborg/' diff --git a/kolla/image/build.py b/kolla/image/build.py index e460fb006..d4dbf447c 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -107,7 +107,6 @@ SKIPPED_IMAGES = { "blazar-base", "cloudkitty-base", "congress-base", - "crane", "cyborg-base", "dragonflow-base", "ec2-api", @@ -135,7 +134,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'ubuntu+source': [ - "crane", "cyborg-base", # There is no qdrouterd package for ubuntu bionic "qdrouterd", @@ -147,7 +145,6 @@ SKIPPED_IMAGES = { "blazar-base", "cloudkitty-base", "congress-base", - "crane", "cyborg-base", "dragonflow-base", "ec2-api", @@ -174,7 +171,6 @@ SKIPPED_IMAGES = { "zun-base" ], 'debian+source': [ - "crane", "cyborg-base", "sensu-base", "tripleoclient", @@ -183,7 +179,6 @@ SKIPPED_IMAGES = { "almanach-base", "bifrost-base", "blazar-base", - "crane", "cyborg-base", "dragonflow-base", "freezer-base", diff --git a/releasenotes/notes/remove-crane-ad12c12b633d4d73.yaml b/releasenotes/notes/remove-crane-ad12c12b633d4d73.yaml new file mode 100644 index 000000000..d36b6155a --- /dev/null +++ b/releasenotes/notes/remove-crane-ad12c12b633d4d73.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``crane`` image which was deprecated in the Stein cycle has been + removed. diff --git a/tools/version-check.py b/tools/version-check.py index f9afdad94..b0d7638d3 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -40,7 +40,6 @@ RELEASE_REPO = 'https://github.com/openstack/releases' TARGET = '.releases' SKIP_PROJECTS = { - 'crane': 'Crane is not managed by openstack/releases project', 'gnocchi-base': 'Gnocchi is not managed by openstack/releases project', 'monasca-thresh': 'Package not published in tarballs.openstack.org', 'rally': 'Rally is not managed by openstack/releases project', |