diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-15 14:47:31 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-15 13:44:06 +0000 |
| commit | 813035ba8fcc2a92e78412d8e4a96740c55e0c2e (patch) | |
| tree | 0623b3f10b3b95bf5245c9b4b7c658f6d2a25b13 /docker | |
| parent | 7e95ffb09815d1918b3b262e074d325b4fb35d70 (diff) | |
| download | kolla-813035ba8fcc2a92e78412d8e4a96740c55e0c2e.tar.gz kolla-813035ba8fcc2a92e78412d8e4a96740c55e0c2e.zip | |
Drop Murano
It's inactive and hasn't produced a 2024.1 release [1].
In addition to that, there's a CVE that hasn't really been patched [2].
[1]: https://governance.openstack.org/tc/reference/emerging-technology-and-inactive-projects.html#current-inactive-projects
[2]: https://lists.openstack.org/archives/list/openstack-announce@lists.openstack.org/thread/4FYM6GSIM5WZSJQIG4TT5Q3UBKQIHLWX/
Change-Id: Ie715eac24247c38b21382c735eb00a9b3b56f145
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 16 | ||||
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/murano/murano-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 31 | ||||
| -rw-r--r-- | docker/murano/murano-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 |
7 files changed, 0 insertions, 95 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index aff48cf63..965aef245 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -137,21 +137,6 @@ function config_masakari_dashboard { "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_masakari.py" } -function config_murano_dashboard { - for file in ${SITE_PACKAGES}/muranodashboard/local/enabled/_*[^__].py; do - config_dashboard "${ENABLE_MURANO:-no}" \ - "${SITE_PACKAGES}/muranodashboard/local/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done - config_dashboard "${ENABLE_MURANO:-no}"\ - "${SITE_PACKAGES}/muranodashboard/conf/murano_policy.json" \ - "/etc/openstack-dashboard/murano_policy.json" - - config_dashboard "${ENABLE_MURANO:-no}"\ - "${SITE_PACKAGES}/muranodashboard/local/local_settings.d/_50_murano.py" \ - "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_murano.py" -} - function config_mistral_dashboard { config_dashboard "${ENABLE_MISTRAL:-no}" \ "${SITE_PACKAGES}/mistraldashboard/enabled/_50_mistral.py" \ @@ -282,7 +267,6 @@ config_magnum_dashboard config_manila_ui config_masakari_dashboard config_mistral_dashboard -config_murano_dashboard config_neutron_vpnaas_dashboard config_octavia_dashboard config_sahara_dashboard diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 deleted file mode 100644 index 0d3637d9e..000000000 --- a/docker/murano/murano-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block murano_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start -RUN chmod 644 /usr/local/bin/kolla_murano_extend_start - -{% block murano_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER murano diff --git a/docker/murano/murano-api/extend_start.sh b/docker/murano/murano-api/extend_start.sh deleted file mode 100644 index d46b2b0af..000000000 --- a/docker/murano/murano-api/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 - murano-db-manage --config-file /etc/murano/murano.conf upgrade - exit 0 -fi diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 deleted file mode 100644 index ba46f6389..000000000 --- a/docker/murano/murano-base/Dockerfile.j2 +++ /dev/null @@ -1,31 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block murano_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='murano') }} - -ADD murano-base-archive /murano-base-source - -{% set murano_base_pip_packages = [ - '/murano' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s murano-base-source/* murano \ - && {{ macros.install_pip(murano_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/murano \ - && cp -r /murano/etc/murano/* /etc/murano/ \ - && cd murano/meta/io.murano \ - && zip -r /io.murano.zip * \ - && cd /murano/meta/io.murano.applications \ - && zip -r /io.murano.applications.zip * \ - && touch /usr/local/bin/kolla_murano_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start - -{% block murano_base_footer %}{% endblock %} diff --git a/docker/murano/murano-base/extend_start.sh b/docker/murano/murano-base/extend_start.sh deleted file mode 100644 index 4d3b842b2..000000000 --- a/docker/murano/murano-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/murano" ]]; then - mkdir -p /var/log/kolla/murano -fi -if [[ $(stat -c %a /var/log/kolla/murano) != "755" ]]; then - chmod 755 /var/log/kolla/murano -fi - -. /usr/local/bin/kolla_murano_extend_start diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 deleted file mode 100644 index bc433a580..000000000 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block murano_engine_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block murano_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER murano diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index e50aaf560..2bfa3a0c6 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -156,7 +156,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-manilaclient', 'python-memcached', 'python-mistralclient', - 'python-muranoclient', 'python-neutronclient', 'python-novaclient', 'python-openstackclient', |
