Drop Sahara
It's inactive and hasn't produced a 2024.1 release [1]. [1]: https://governance.openstack.org/tc/reference/emerging-technology-and-inactive-projects.html#current-inactive-projects Change-Id: I7b5b032a4175c5390c9b7ff3fbd4c672adcb5325
This commit is contained in:
Michal Nasiadka
parent
14a2e37f00
commit
4d9379ecc8
|
|
@ -92,7 +92,6 @@ Kolla provides images to deploy the following OpenStack projects:
|
|||
- `Neutron <https://docs.openstack.org/neutron/latest/>`__
|
||||
- `Nova <https://docs.openstack.org/nova/latest/>`__
|
||||
- `Octavia <https://docs.openstack.org/octavia/latest/>`__
|
||||
- `Sahara <https://docs.openstack.org/sahara/latest/>`__ (deprecated)
|
||||
- Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
|
||||
- `Solum <https://docs.openstack.org/solum/latest/>`__
|
||||
- `Swift <https://docs.openstack.org/swift/latest/>`__
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ placement,U,U,U
|
|||
prometheus,U,U,U
|
||||
rabbitmq,U,U,U
|
||||
redis,U,U,U
|
||||
sahara,U,U,U
|
||||
skyline,U,U,U
|
||||
solum,U,U,U
|
||||
swift,U,U,U
|
||||
|
|
|
|||
|
|
|
@ -49,7 +49,6 @@ placement,T,T,T
|
|||
prometheus,U,U,U
|
||||
rabbitmq,T,T,T
|
||||
redis,T,U,U
|
||||
sahara,U,U,U
|
||||
skyline,U,U,U
|
||||
solum,U,U,U
|
||||
swift,T,T,U
|
||||
|
|
|
|||
|
|
|
@ -155,14 +155,6 @@ function config_octavia_dashboard {
|
|||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py"
|
||||
}
|
||||
|
||||
function config_sahara_dashboard {
|
||||
for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
|
||||
config_dashboard "${ENABLE_SAHARA:-no}" \
|
||||
"${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
|
||||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
|
||||
done
|
||||
}
|
||||
|
||||
function config_solum_dashboard {
|
||||
for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do
|
||||
config_dashboard "${ENABLE_SOLUM:-no}" \
|
||||
|
|
@ -257,7 +249,6 @@ config_masakari_dashboard
|
|||
config_mistral_dashboard
|
||||
config_neutron_vpnaas_dashboard
|
||||
config_octavia_dashboard
|
||||
config_sahara_dashboard
|
||||
config_solum_dashboard
|
||||
config_tacker_dashboard
|
||||
config_trove_dashboard
|
||||
|
|
|
|||
|
|
@ -160,7 +160,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
'python-novaclient',
|
||||
'python-openstackclient',
|
||||
'python-qpid-proton',
|
||||
'python-saharaclient',
|
||||
'python-swiftclient',
|
||||
'python-troveclient',
|
||||
'python-vitrageclient',
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block sahara_api_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start
|
||||
RUN chmod 644 /usr/local/bin/kolla_sahara_extend_start
|
||||
|
||||
{% block sahara_api_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER sahara
|
||||
|
|
@ -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
|
||||
sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block sahara_base_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{{ macros.configure_user(name='sahara') }}
|
||||
|
||||
{% if base_package_type == 'rpm' %}
|
||||
{% set sahara_base_packages = ['openssh'] %}
|
||||
{% elif base_package_type == 'deb' %}
|
||||
{% set sahara_base_packages = ['openssh-client'] %}
|
||||
{% endif %}
|
||||
{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
|
||||
|
||||
ADD sahara-base-archive /sahara-base-source
|
||||
ADD plugins-archive /
|
||||
|
||||
{% set sahara_base_pip_packages = [
|
||||
'/sahara'
|
||||
] %}
|
||||
{% set sahara_base_plugins_pip_packages = [
|
||||
'/plugins/*',
|
||||
] %}
|
||||
|
||||
COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers
|
||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||
|
||||
RUN ln -s sahara-base-source/* sahara \
|
||||
&& {{ macros.install_pip(sahara_base_pip_packages | customizable("pip_packages")) }} \
|
||||
&& if [ "$(ls /plugins)" ]; then \
|
||||
{{ macros.install_pip(sahara_base_plugins_pip_packages) }}; \
|
||||
fi \
|
||||
&& mkdir -p /etc/sahara \
|
||||
&& cp -r /sahara/etc/sahara/* /etc/sahara/ \
|
||||
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/sahara/rootwrap.conf \
|
||||
&& chmod 750 /etc/sudoers.d \
|
||||
&& chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \
|
||||
&& touch /usr/local/bin/kolla_sahara_extend_start \
|
||||
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
|
||||
|
||||
{% block sahara_base_footer %}{% endblock %}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [[ ! -d "/var/log/kolla/sahara" ]]; then
|
||||
mkdir -p /var/log/kolla/sahara
|
||||
fi
|
||||
if [[ $(stat -c %a /var/log/kolla/sahara) != "755" ]]; then
|
||||
chmod 755 /var/log/kolla/sahara
|
||||
fi
|
||||
|
||||
. /usr/local/bin/kolla_sahara_extend_start
|
||||
|
|
@ -1 +0,0 @@
|
|||
%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/sahara-rootwrap /etc/sahara/rootwrap.conf *
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block sahara_engine_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if base_package_type == 'rpm' %}
|
||||
{% set sahara_engine_packages = ['nc'] %}
|
||||
{% elif base_package_type == 'deb' %}
|
||||
{% set sahara_engine_packages = ['netcat-openbsd'] %}
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(sahara_engine_packages | customizable("packages")) }}
|
||||
|
||||
{% block sahara_engine_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER sahara
|
||||
|
|
@ -102,7 +102,6 @@ _PROFILE_OPTS = [
|
|||
'mistral',
|
||||
'octavia',
|
||||
'redis',
|
||||
'sahara',
|
||||
'solum',
|
||||
'tacker',
|
||||
'telegraf',
|
||||
|
|
|
|||
|
|
@ -139,10 +139,6 @@ SOURCES = {
|
|||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/octavia-dashboard/'
|
||||
'octavia-dashboard-${openstack_branch}.tar.gz')},
|
||||
'horizon-plugin-sahara-dashboard': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-dashboard/'
|
||||
'sahara-dashboard-${openstack_branch}.tar.gz')},
|
||||
'horizon-plugin-solum-dashboard': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/solum-dashboard/'
|
||||
|
|
@ -416,34 +412,6 @@ SOURCES = {
|
|||
'releases/download/v${version}/'
|
||||
'prometheus'
|
||||
'-${version}.linux-${debian_arch}.tar.gz')},
|
||||
'sahara-base': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara/'
|
||||
'sahara-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-ambari': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-ambari/'
|
||||
'sahara-plugin-ambari-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-cdh': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-cdh/'
|
||||
'sahara-plugin-cdh-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-mapr': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-mapr/'
|
||||
'sahara-plugin-mapr-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-spark': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-spark/'
|
||||
'sahara-plugin-spark-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-storm': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-storm/'
|
||||
'sahara-plugin-storm-${openstack_branch}.tar.gz')},
|
||||
'sahara-base-plugin-vanilla': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
|
||||
'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
|
||||
'skyline-apiserver': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/skyline-apiserver/'
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ USERS = {
|
|||
'uid': 42440,
|
||||
'gid': 42440,
|
||||
},
|
||||
'sahara-user': {
|
||||
'sahara-user': { # unused user (sahara dropped)
|
||||
'uid': 42441,
|
||||
'gid': 42441,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
``Sahara`` container images have been dropped.
|
||||
|
|
@ -56,7 +56,6 @@ kolla_build_sources:
|
|||
- neutron-base-plugin-vpnaas-agent
|
||||
openstack/nova: nova-base
|
||||
openstack/octavia: octavia-base
|
||||
openstack/sahara: sahara-base
|
||||
openstack/skyline: skyline-base
|
||||
openstack/solum: solum-base
|
||||
swift-base: openstack/swift
|
||||
|
|
@ -83,7 +82,6 @@ kolla_build_sources:
|
|||
openstack/monasca-ui: horizon-plugin-monasca-ui
|
||||
openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard
|
||||
openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
|
||||
openstack/sahara-dashboard: horizon-plugin-sahara-dashboard
|
||||
openstack/solum-dashboard: horizon-plugin-solum-dashboard
|
||||
openstack/tacker-horizon: horizon-plugin-tacker-dashboard
|
||||
openstack/trove-dashboard: horizon-plugin-trove-dashboard
|
||||
|
|
|
|||
Loading…
Reference in New Issue