Merge "Migrate to pyproject.toml"

5 files changed, 0 insertions, 94 deletions

diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2
deleted file mode 100644
index c24c8d87c..000000000
--- a/docker/tacker/tacker-base/Dockerfile.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block tacker_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='tacker') }}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-
-{% endif %}
-
-ADD tacker-base-archive /tacker-base-source
-ADD plugins-archive /
-
-{% set tacker_base_pip_packages = [
-    '/tacker'
-] %}
-
-{% set tacker_base_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s tacker-base-source/* tacker \
-    && {{ macros.install_pip(tacker_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/tacker \
-    && cp -r /tacker/etc/tacker/* /etc/tacker \
-    && if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \
-       fi \
-    && touch /usr/local/bin/kolla_tacker_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block tacker_base_footer %}{% endblock %}
diff --git a/docker/tacker/tacker-base/extend_start.sh b/docker/tacker/tacker-base/extend_start.sh
deleted file mode 100644
index a3b7db8d3..000000000
--- a/docker/tacker/tacker-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/tacker" ]]; then
-    mkdir -p /var/log/kolla/tacker
-fi
-if [[ $(stat -c %a /var/log/kolla/tacker) != "755" ]]; then
-    chmod 755 /var/log/kolla/tacker
-fi
-
-. /usr/local/bin/kolla_tacker_extend_start
diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2
deleted file mode 100644
index 676c90106..000000000
--- a/docker/tacker/tacker-conductor/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block tacker_conductor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block tacker_conductor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER tacker
diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2
deleted file mode 100644
index 659b70bea..000000000
--- a/docker/tacker/tacker-server/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}tacker-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block tacker_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start
-RUN chmod 644 /usr/local/bin/kolla_tacker_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block tacker_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER tacker
diff --git a/docker/tacker/tacker-server/extend_start.sh b/docker/tacker/tacker-server/extend_start.sh
deleted file mode 100644
index 311d21f71..000000000
--- a/docker/tacker/tacker-server/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# 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
-    tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head
-    exit 0
-fi