Browse Source

Merge "Remove deployment of FWaaS"

changes/99/707599/11
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
12905b5fc1
6 changed files with 0 additions and 26 deletions
  1. +0
    -1
      docker/horizon/Dockerfile.j2
  2. +0
    -9
      docker/horizon/extend_start.sh
  3. +0
    -2
      docker/neutron/neutron-base/Dockerfile.j2
  4. +0
    -1
      docker/neutron/neutron-server/extend_start.sh
  5. +0
    -8
      kolla/common/config.py
  6. +0
    -5
      kolla/tests/etc/default.conf

+ 0
- 1
docker/horizon/Dockerfile.j2 View File

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


+ 0
- 9
docker/horizon/extend_start.sh View File

@@ -88,14 +88,6 @@ function config_designate_dashboard {
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 {
for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do
config_dashboard "${ENABLE_FREEZER}" \
@@ -331,7 +323,6 @@ function settings_changed {
config_blazar_dashboard
config_cloudkitty_dashboard
config_designate_dashboard
config_fwaas_dashboard
config_freezer_ui
config_heat_dashboard
config_ironic_dashboard


+ 0
- 2
docker/neutron/neutron-base/Dockerfile.j2 View File

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


+ 0
- 1
docker/neutron/neutron-server/extend_start.sh 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"
neutron-db-manage ${OPTS} --subproject neutron 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
exit 0
fi


+ 0
- 8
kolla/common/config.py View File

@@ -373,10 +373,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/designate-dashboard/'
'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': {
'type': 'url',
'location': ('$tarballs_base/openstack/freezer-web-ui/'
@@ -554,10 +550,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/neutron/'
'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': {
'type': 'url',
'location': ('$tarballs_base/x/networking-ansible/'


+ 0
- 5
kolla/tests/etc/default.conf View File

@@ -6,11 +6,6 @@ reference = master
location = https://opendev.org/x/networking-arista
type = git

[neutron-base-plugin-neutron-fwaas]
reference = master
location = https://opendev.org/openstack/neutron-fwaas
type = git

[profiles]
default = image-base
all = image-base,image-child

Loading…
Cancel
Save