Merge "Remove Retired Karbor Support"
This commit is contained in:
Zuul
Gerrit Code Review
commit
1609ffcb4f
@ -85,7 +85,6 @@ Kolla provides images to deploy the following OpenStack projects:
|
||||
- `Heat <https://docs.openstack.org/heat/latest/>`__
|
||||
- `Horizon <https://docs.openstack.org/horizon/latest/>`__
|
||||
- `Ironic <https://docs.openstack.org/ironic/latest/>`__
|
||||
- `Karbor <https://docs.openstack.org/karbor/latest/>`__
|
||||
- `Keystone <https://docs.openstack.org/keystone/latest/>`__
|
||||
- `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
|
||||
- `Magnum <https://docs.openstack.org/magnum/latest/>`__
|
||||
|
||||
@ -32,7 +32,6 @@ ironic-neutron-agent,N,N,N,N,N,N
|
||||
ironic-inspector,N,N,N,N,N,N
|
||||
iscsid,C,C,C,C,N,C
|
||||
kafka,C,C,C,C,N,C
|
||||
karbor,N,C,N,C,N,C
|
||||
keepalived,C,C,C,C,N,C
|
||||
keystone,C,C,C,C,N,C
|
||||
kibana,N,N,N,N,C,C
|
||||
|
||||
|
@ -33,7 +33,6 @@ ironic-neutron-agent,T,T,N,T,N,C
|
||||
ironic-inspector,T,T,C,T,C,C
|
||||
iscsid,T,T,T,T,C,C
|
||||
kafka,C,C,C,C,C,C
|
||||
karbor,N,C,N,C,N,C
|
||||
keepalived,T,T,T,T,C,C
|
||||
keystone,T,T,T,T,C,T
|
||||
kibana,C,C,C,C,C,C
|
||||
|
||||
|
@ -116,14 +116,6 @@ function config_ironic_dashboard {
|
||||
done
|
||||
}
|
||||
|
||||
function config_karbor_dashboard {
|
||||
for file in ${SITE_PACKAGES}/karbor_dashboard/enabled/_*[^__].py; do
|
||||
config_dashboard "${ENABLE_KARBOR}" \
|
||||
"${SITE_PACKAGES}/karbor_dashboard/enabled/${file##*/}" \
|
||||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
|
||||
done
|
||||
}
|
||||
|
||||
function config_magnum_dashboard {
|
||||
for file in ${SITE_PACKAGES}/magnum_ui/enabled/_*[^__].py; do
|
||||
config_dashboard "${ENABLE_MAGNUM}" \
|
||||
@ -309,7 +301,6 @@ config_designate_dashboard
|
||||
config_freezer_ui
|
||||
config_heat_dashboard
|
||||
config_ironic_dashboard
|
||||
config_karbor_dashboard
|
||||
config_magnum_dashboard
|
||||
config_manila_ui
|
||||
config_masakari_dashboard
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block karbor_api_header %}{% endblock %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
|
||||
{% endif %}
|
||||
|
||||
COPY extend_start.sh /usr/local/bin/kolla_karbor_extend_start
|
||||
RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start
|
||||
|
||||
{% block karbor_api_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER karbor
|
||||
@ -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
|
||||
karbor-manage db sync
|
||||
exit 0
|
||||
fi
|
||||
@ -1,38 +0,0 @@
|
||||
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block karbor_base_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{{ macros.configure_user(name='karbor') }}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
|
||||
{% elif install_type == 'source' %}
|
||||
|
||||
ADD karbor-base-archive /karbor-base-source
|
||||
|
||||
{% set karbor_base_pip_packages = [
|
||||
'/karbor'
|
||||
] %}
|
||||
|
||||
RUN ln -s karbor-base-source/* karbor \
|
||||
&& {{ macros.install_pip(karbor_base_pip_packages | customizable("pip_packages")) }} \
|
||||
&& mkdir -p /etc/karbor \
|
||||
&& cp -r /karbor/etc/* /etc/karbor/ \
|
||||
&& chown -R karbor: /etc/karbor
|
||||
|
||||
{% endif %}
|
||||
|
||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||
|
||||
RUN touch /usr/local/bin/kolla_karbor_extend_start \
|
||||
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_karbor_extend_start
|
||||
|
||||
{% block karbor_base_footer %}{% endblock %}
|
||||
@ -1,10 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [[ ! -d "/var/log/kolla/karbor" ]]; then
|
||||
mkdir -p /var/log/kolla/karbor
|
||||
fi
|
||||
if [[ $(stat -c %a /var/log/kolla/karbor) != "755" ]]; then
|
||||
chmod 755 /var/log/kolla/karbor
|
||||
fi
|
||||
|
||||
. /usr/local/bin/kolla_karbor_extend_start
|
||||
@ -1,18 +0,0 @@
|
||||
FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block karbor_operationengine_header %}{% endblock %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block karbor_operationengine_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER karbor
|
||||
@ -1,18 +0,0 @@
|
||||
FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }}
|
||||
{% block labels %}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
{% endblock %}
|
||||
|
||||
{% block karbor_protection_header %}{% endblock %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block karbor_protection_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER karbor
|
||||
@ -101,7 +101,6 @@ _PROFILE_OPTS = [
|
||||
'influxdb',
|
||||
'ironic',
|
||||
'kafka',
|
||||
'karbor',
|
||||
'kuryr',
|
||||
'magnum',
|
||||
'manila',
|
||||
@ -381,10 +380,6 @@ SOURCES = {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/ironic-ui/'
|
||||
'ironic-ui-${openstack_branch}.tar.gz')},
|
||||
'horizon-plugin-karbor-dashboard': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/karbor-dashboard/'
|
||||
'karbor-dashboard-${openstack_branch}.tar.gz')},
|
||||
'horizon-plugin-magnum-ui': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/magnum-ui/'
|
||||
@ -461,10 +456,6 @@ SOURCES = {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/ironic-inspector/'
|
||||
'ironic-inspector-${openstack_branch}.tar.gz')},
|
||||
'karbor-base': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/karbor/'
|
||||
'karbor-${openstack_branch}.tar.gz')},
|
||||
'keystone-base': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/openstack/keystone/'
|
||||
@ -996,10 +987,6 @@ USERS = {
|
||||
'uid': 42457,
|
||||
'gid': 42457,
|
||||
},
|
||||
'karbor-user': {
|
||||
'uid': 42458,
|
||||
'gid': 42458,
|
||||
},
|
||||
'vitrage-user': {
|
||||
'uid': 42459,
|
||||
'gid': 42459,
|
||||
|
||||
@ -101,7 +101,6 @@ UNBUILDABLE_IMAGES = {
|
||||
"blazar-base",
|
||||
"cyborg-base",
|
||||
"freezer-base",
|
||||
"karbor-base",
|
||||
"kuryr-base",
|
||||
"masakari-base",
|
||||
"monasca-base",
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``Karbor`` project is no longer maintained and
|
||||
`retired since Wallaby cycle`__ . Its images and support
|
||||
is also removed since Wallaby cycle.
|
||||
|
||||
__ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018643.html
|
||||
@ -30,7 +30,6 @@ kolla_build_sources:
|
||||
openstack/heat: heat-base
|
||||
openstack/ironic: ironic-base
|
||||
openstack/ironic-inspector: ironic-inspector
|
||||
openstack/karbor: karbor-base
|
||||
openstack/keystone: keystone-base
|
||||
openstack/kuryr: kuryr-base
|
||||
openstack/kuryr-libnetwork: kuryr-libnetwork
|
||||
@ -90,7 +89,6 @@ kolla_build_sources:
|
||||
openstack/freezer-web-ui: horizon-plugin-freezer-web-ui
|
||||
openstack/heat-dashboard: horizon-plugin-heat-dashboard
|
||||
openstack/ironic-ui: horizon-plugin-ironic-ui
|
||||
openstack/karbor-dashboard: horizon-plugin-karbor-dashboard
|
||||
openstack/magnum-ui: horizon-plugin-magnum-ui
|
||||
openstack/manila-ui: horizon-plugin-manila-ui
|
||||
openstack/mistral-dashboard: horizon-plugin-mistral-dashboard
|
||||
|
||||
Loading…
Reference in New Issue
Block a user