aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.rst1
-rw-r--r--doc/source/matrix_aarch64.csv1
-rw-r--r--doc/source/matrix_x86.csv1
-rw-r--r--docker/horizon/extend_start.sh16
-rw-r--r--docker/murano/murano-api/Dockerfile.j216
-rw-r--r--docker/murano/murano-api/extend_start.sh8
-rw-r--r--docker/murano/murano-base/Dockerfile.j231
-rw-r--r--docker/murano/murano-base/extend_start.sh10
-rw-r--r--docker/murano/murano-engine/Dockerfile.j213
-rw-r--r--docker/openstack-base/Dockerfile.j21
-rw-r--r--kolla/common/config.py1
-rw-r--r--kolla/common/sources.py8
-rw-r--r--kolla/common/users.py2
-rw-r--r--releasenotes/notes/drop-murano-bcd243c986eaa225.yaml4
-rw-r--r--roles/kolla-build-config/defaults/main.yml2
15 files changed, 5 insertions, 110 deletions
diff --git a/README.rst b/README.rst
index 2859e123b..66b1779ff 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,6 @@ Kolla provides images to deploy the following OpenStack projects:
- `Masakari <https://docs.openstack.org/masakari/latest/>`__ (deprecated)
- `Mistral <https://docs.openstack.org/mistral/latest/>`__
- `Monasca <https://docs.openstack.org/monasca-api/latest/>`__
-- `Murano <https://docs.openstack.org/murano/latest/>`__
- `Neutron <https://docs.openstack.org/neutron/latest/>`__
- `Nova <https://docs.openstack.org/nova/latest/>`__
- `Octavia <https://docs.openstack.org/octavia/latest/>`__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 55f936cbb..cb11ee489 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -35,7 +35,6 @@ masakari,U,U,U
memcached,U,U,U
mistral,U,U,U
multipathd,U,U,U
-murano,U,U,U
neutron,U,U,U
neutron-mlnx-agent,U,U,U
nova,U,U,U
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 9c1fa0368..384221223 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -36,7 +36,6 @@ masakari,T,T,U
memcached,T,T,U
mistral,T,U,U
multipathd,U,U,U
-murano,U,U,U
neutron,T,T,T
neutron-mlnx-agent,U,U,U
nova,T,T,T
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',
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3a74c7dc6..ab13f1154 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -100,7 +100,6 @@ _PROFILE_OPTS = [
'manila',
'masakari',
'mistral',
- 'murano',
'octavia',
'redis',
'sahara',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 88db3f40f..fa1ddda7d 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -131,10 +131,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/mistral-dashboard/'
'mistral-dashboard-${openstack_branch}.tar.gz')},
- 'horizon-plugin-murano-dashboard': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/murano-dashboard/'
- 'murano-dashboard-${openstack_branch}.tar.gz')},
'horizon-plugin-neutron-vpnaas-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-vpnaas-dashboard/'
@@ -237,10 +233,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/tacker/'
'tacker-${openstack_branch}.tar.gz')},
- 'murano-base': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/murano/'
- 'murano-${openstack_branch}.tar.gz')},
'neutron-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
index 34840c9b7..8f6c2144d 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -133,7 +133,7 @@ USERS = {
'uid': 42432,
'gid': 42432,
},
- 'murano-user': {
+ 'murano-user': { # unused user (murano dropped)
'uid': 42433,
'gid': 42433,
},
diff --git a/releasenotes/notes/drop-murano-bcd243c986eaa225.yaml b/releasenotes/notes/drop-murano-bcd243c986eaa225.yaml
new file mode 100644
index 000000000..0067b2ac4
--- /dev/null
+++ b/releasenotes/notes/drop-murano-bcd243c986eaa225.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ ``Murano`` container images have been dropped.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index 7cfe16a90..f1dd42555 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -41,7 +41,6 @@ kolla_build_sources:
openstack/monasca-persister: monasca-persister
openstack/monasca-statsd: monasca-statsd
openstack/monasca-common: monasca-thresh-additions-monasca-common
- openstack/murano: murano-base
openstack/neutron: neutron-base
openstack/networking-baremetal: neutron-base-plugin-networking-baremetal
openstack/neutron-dynamic-routing:
@@ -83,7 +82,6 @@ kolla_build_sources:
openstack/manila-ui: horizon-plugin-manila-ui
openstack/mistral-dashboard: horizon-plugin-mistral-dashboard
openstack/monasca-ui: horizon-plugin-monasca-ui
- openstack/murano-dashboard: horizon-plugin-murano-dashboard
openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard
openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
openstack/sahara-dashboard: horizon-plugin-sahara-dashboard
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 15:44:24 +0000