Merge "Remove ec2-api image"

doc/source/matrix_aarch64.csv

@@ -14,7 +14,6 @@ cron,C,C,C,C,N,C
 cyborg,N,C,N,C,N,C
 designate,C,C,C,C,N,C
 dnsmasq,C,C,C,C,N,C
-ec2-api (deprecated),C,C,C,C,N,C
 elasticsearch,N,N,C,C,N,C
 etcd,C,C,C,C,N,C
 fluentd,C,C,C,C,N,C

doc/source/matrix_x86.csv

@@ -14,7 +14,6 @@ cron,T,T,T,T,C,T
 cyborg,N,C,N,C,N,C
 designate,C,C,C,C,C,C
 dnsmasq,T,T,C,T,C,C
-ec2-api (deprecated),C,C,N,C,N,C
 elasticsearch,C,C,C,C,C,C
 etcd,C,T,C,T,C,C
 fluentd,T,T,T,T,C,T

docker/ec2-api/Dockerfile.j2

@@ -1,51 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block ec2_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='ec2api') }}
-
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set ec2_api_packages = [
-            'openstack-ec2-api'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-    {% endif %}
-
-{{ macros.install_packages(ec2_api_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-ADD ec2-api-archive /ec2-api-source
-
-{% set ec2_api_pip_packages = [
-    '/ec2-api'
-] %}
-
-RUN ln -s ec2-api-source/* ec2-api \
-    && {{ macros.install_pip(ec2_api_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/ec2api \
-    && cp -r /ec2-api/etc/ec2api/* /etc/ec2api \
-    && chown -R ec2api: /etc/ec2api
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block ec2_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER ec2api

docker/ec2-api/extend_start.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/ec2-api" ]]; then
-    mkdir -p /var/log/kolla/ec2-api
-fi
-if [[ $(stat -c %a /var/log/kolla/ec2-api) != "755" ]]; then
-    chmod 755 /var/log/kolla/ec2-api
-fi
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    ec2-api-manage db_sync
-    exit 0
-fi

kolla/common/config.py

@@ -93,7 +93,6 @@ _PROFILE_OPTS = [
                     'blazar',
                     'cloudkitty',
                     'designate',
-                    'ec2-api',
                     'freezer',
                     'gnocchi',
                     'influxdb',
@@ -324,10 +323,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/designate/'
                      'designate-${openstack_branch}.tar.gz')},
-    'ec2-api': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/ec2-api/'
-                     'ec2-api-${openstack_branch}.tar.gz')},
     'freezer-api': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/freezer-api/'

kolla/image/build.py

@@ -162,7 +162,6 @@ UNBUILDABLE_IMAGES = {
 
     'debian+binary': {
         "cloudkitty-base",
-        "ec2-api",
         "ironic-neutron-agent",
         "nova-serialproxy",
         "senlin-conductor",  # no binary package
@@ -173,7 +172,6 @@ UNBUILDABLE_IMAGES = {
 
     'ubuntu+binary': {
         "cloudkitty-base",
-        "ec2-api",
         "ironic-neutron-agent",
         "rally",
         "senlin-conductor",  # no binary package

releasenotes/notes/remove-ec2-api-image-97937bc84dfa6c18.yaml

@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``ec2-api`` image is removed per the deprecation cycle.

roles/kolla-build-config/defaults/main.yml

@@ -22,7 +22,6 @@ kolla_build_sources:
   openstack/cinder: cinder-base
   openstack/cloudkitty: cloudkitty-base
   openstack/designate: designate-base
-  openstack/ec2-api: ec2-api
   openstack/freezer: freezer-base
   openstack/freezer-api: freezer-api
   openstack/glance: glance-base