Remove deployment of FWaaS

FWaaS is being retired upstream [1][2] in V cycle.

[1] https://review.opendev.org/#/c/735838/

Change-Id: I45679c8596844780565644e52034bd3de0915ff4
This commit is contained in:
Alfredo Moralejo 2020-06-18 16:03:55 +02:00 committed by Marcin Juszkiewicz
parent 039a6d431a
commit d3742fb9d8
6 changed files with 0 additions and 26 deletions

View File

@ -66,7 +66,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
] %} ] %}
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
{% set horizon_packages = horizon_packages + [ {% set horizon_packages = horizon_packages + [
'python3-neutron-fwaas-dashboard',
'python3-neutron-vpnaas-dashboard', 'python3-neutron-vpnaas-dashboard',
'python3-vitrage-dashboard', 'python3-vitrage-dashboard',
] %} ] %}

View File

@ -96,14 +96,6 @@ function config_designate_dashboard {
done done
} }
function config_fwaas_dashboard {
for file in ${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_FWAAS}" \
"${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/${file##*/}" \
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
done
}
function config_freezer_ui { function config_freezer_ui {
for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do
config_dashboard "${ENABLE_FREEZER}" \ config_dashboard "${ENABLE_FREEZER}" \
@ -340,7 +332,6 @@ config_blazar_dashboard
config_cloudkitty_dashboard config_cloudkitty_dashboard
config_congress_dashboard config_congress_dashboard
config_designate_dashboard config_designate_dashboard
config_fwaas_dashboard
config_freezer_ui config_freezer_ui
config_heat_dashboard config_heat_dashboard
config_ironic_dashboard config_ironic_dashboard

View File

@ -18,7 +18,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'net-tools', 'net-tools',
'radvd', 'radvd',
'openstack-neutron', 'openstack-neutron',
'openstack-neutron-fwaas',
'openstack-neutron-ml2', 'openstack-neutron-ml2',
'openvswitch', 'openvswitch',
'python3-networking-baremetal', 'python3-networking-baremetal',
@ -42,7 +41,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch', 'openvswitch-switch',
'python3-networking-mlnx', 'python3-networking-mlnx',
'python3-networking-sfc', 'python3-networking-sfc',
'python3-neutron-fwaas',
'python3-openvswitch', 'python3-openvswitch',
'python3-oslo.vmware' 'python3-oslo.vmware'
] %} ] %}

View File

@ -6,7 +6,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
OPTS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" OPTS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
neutron-db-manage ${OPTS} --subproject neutron upgrade head neutron-db-manage ${OPTS} --subproject neutron upgrade head
neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head
neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head
neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head
exit 0 exit 0
fi fi

View File

@ -379,10 +379,6 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/openstack/designate-dashboard/' 'location': ('$tarballs_base/openstack/designate-dashboard/'
'designate-dashboard-${openstack_branch}.tar.gz')}, 'designate-dashboard-${openstack_branch}.tar.gz')},
'horizon-plugin-fwaas-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-fwaas-dashboard/'
'neutron-fwaas-dashboard-${openstack_branch}.tar.gz')},
'horizon-plugin-freezer-web-ui': { 'horizon-plugin-freezer-web-ui': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/openstack/freezer-web-ui/' 'location': ('$tarballs_base/openstack/freezer-web-ui/'
@ -560,10 +556,6 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/openstack/neutron/' 'location': ('$tarballs_base/openstack/neutron/'
'neutron-${openstack_branch}.tar.gz')}, 'neutron-${openstack_branch}.tar.gz')},
'neutron-base-plugin-neutron-fwaas': {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron-fwaas/'
'neutron-fwaas-${openstack_branch}.tar.gz')},
'neutron-base-plugin-networking-ansible': { 'neutron-base-plugin-networking-ansible': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/x/networking-ansible/' 'location': ('$tarballs_base/x/networking-ansible/'

View File

@ -6,11 +6,6 @@ reference = master
location = https://opendev.org/x/networking-arista location = https://opendev.org/x/networking-arista
type = git type = git
[neutron-base-plugin-neutron-fwaas]
reference = master
location = https://opendev.org/openstack/neutron-fwaas
type = git
[profiles] [profiles]
default = image-base default = image-base
all = image-base,image-child all = image-base,image-child