aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2021-01-14 09:05:35 +0100
committerChristian Berendt <berendt@betacloud-solutions.de>2021-01-14 09:05:35 +0100
commitcc2a97f0f1e84aebf0a59e654d6793439dfc4d18 (patch)
treeb7e32e85997400602fbb7ecef4406711f03f14e0 /docker
parent93204ecfeca7ba394bd4c3872147357aa708f46e (diff)
downloadkolla-cc2a97f0f1e84aebf0a59e654d6793439dfc4d18.tar.gz
kolla-cc2a97f0f1e84aebf0a59e654d6793439dfc4d18.zip
Remove novajoin image
Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de> Change-Id: Ia636747bc2d886f44abb2f4f816fcb621b90a298
Diffstat (limited to 'docker')
-rw-r--r--docker/novajoin/novajoin-base/Dockerfile.j255
-rw-r--r--docker/novajoin/novajoin-base/extend_start.sh10
-rw-r--r--docker/novajoin/novajoin-notifier/Dockerfile.j218
-rw-r--r--docker/novajoin/novajoin-server/Dockerfile.j218
4 files changed, 0 insertions, 101 deletions
diff --git a/docker/novajoin/novajoin-base/Dockerfile.j2 b/docker/novajoin/novajoin-base/Dockerfile.j2
deleted file mode 100644
index 720649f88..000000000
--- a/docker/novajoin/novajoin-base/Dockerfile.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='novajoin') }}
-
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- {% set novajoin_base_packages = [
- 'python3-novajoin'
- ] %}
- {% else %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
- {% endif %}
-
-{{ macros.install_packages(novajoin_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
- {% set novajoin_base_packages = [
- 'ipa-admintools',
- ] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
- {% set novajoin_base_packages = [
- 'freeipa-client',
- ] %}
- {% endif %}
-
-{{ macros.install_packages(novajoin_base_packages | customizable("packages")) }}
-
-ADD novajoin-base-archive /novajoin-base-source
-
-{% set novajoin_base_pip_packages = [
- '/novajoin'
-] %}
-
-RUN ln -s novajoin-base-source/* novajoin \
- && {{ macros.install_pip(novajoin_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/nova /etc/novajoin \
- && chown -R novajoin: /etc/nova /etc/novajoin
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 750 /etc/sudoers.d \
- && touch /usr/local/bin/kolla_novajoin_extend_start \
- && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_novajoin_extend_start
-
-{% block novajoin_base_footer %}{% endblock %}
diff --git a/docker/novajoin/novajoin-base/extend_start.sh b/docker/novajoin/novajoin-base/extend_start.sh
deleted file mode 100644
index f5b38b898..000000000
--- a/docker/novajoin/novajoin-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/novajoin" ]]; then
- mkdir -p /var/log/kolla/novajoin
-fi
-if [[ $(stat -c %a /var/log/kolla/novajoin) != "755" ]]; then
- chmod 755 /var/log/kolla/novajoin
-fi
-
-. /usr/local/bin/kolla_novajoin_extend_start
diff --git a/docker/novajoin/novajoin-notifier/Dockerfile.j2 b/docker/novajoin/novajoin-notifier/Dockerfile.j2
deleted file mode 100644
index 29852a8de..000000000
--- a/docker/novajoin/novajoin-notifier/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_notifier_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
- {% if base_package_type != 'rpm' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
- {% endif %}
-{% endif %}
-
-{% block novajoin_notifier_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/novajoin/novajoin-server/Dockerfile.j2 b/docker/novajoin/novajoin-server/Dockerfile.j2
deleted file mode 100644
index 5dd000ce6..000000000
--- a/docker/novajoin/novajoin-server/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
- {% if base_package_type != 'rpm' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
- {% endif %}
-{% endif %}
-
-{% block novajoin_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}