Remove crane image
This image was deprecated in the Stein cycle. Change-Id: I249b78cd263c97c4a9223523c77f8c325f3e649a
This commit is contained in:
Mark Goddard
parent
03ca8c6325
commit
c63f817730
|
|
@ -80,7 +80,6 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
|
|||
{% if base_arch == 'x86_64' %}
|
||||
{% set base_yum_repo_files = [
|
||||
'ceph.repo',
|
||||
'crane.repo',
|
||||
'elasticsearch.repo',
|
||||
'grafana.repo',
|
||||
'influxdb.repo',
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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 %}
|
||||
|
|
@ -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
|
||||
|
|
@ -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/'
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ SKIPPED_IMAGES = {
|
|||
"blazar-base",
|
||||
"cloudkitty-base",
|
||||
"congress-base",
|
||||
"crane",
|
||||
"cyborg-base",
|
||||
"dragonflow-base",
|
||||
"ec2-api",
|
||||
|
|
@ -139,7 +138,6 @@ SKIPPED_IMAGES = {
|
|||
"zun-base",
|
||||
],
|
||||
'ubuntu+source': [
|
||||
"crane",
|
||||
"cyborg-base",
|
||||
# There is no qdrouterd package for ubuntu bionic
|
||||
"qdrouterd",
|
||||
|
|
@ -154,7 +152,6 @@ SKIPPED_IMAGES = {
|
|||
"blazar-base",
|
||||
"cloudkitty-base",
|
||||
"congress-base",
|
||||
"crane",
|
||||
"cyborg-base",
|
||||
"dragonflow-base",
|
||||
"ec2-api",
|
||||
|
|
@ -182,7 +179,6 @@ SKIPPED_IMAGES = {
|
|||
"zun-base"
|
||||
],
|
||||
'debian+source': [
|
||||
"crane",
|
||||
"cyborg-base",
|
||||
"sensu-base",
|
||||
"tripleoclient",
|
||||
|
|
@ -192,7 +188,6 @@ SKIPPED_IMAGES = {
|
|||
"almanach-base",
|
||||
"bifrost-base",
|
||||
"blazar-base",
|
||||
"crane",
|
||||
"cyborg-base",
|
||||
"dragonflow-base",
|
||||
"freezer-base",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``crane`` image which was deprecated in the Stein cycle has been
|
||||
removed.
|
||||
|
|
@ -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',
|
||||
|
|
|
|||
Loading…
Reference in New Issue