diff options
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 1 | ||||
| -rwxr-xr-x | kolla/common/config.py | 8 | ||||
| -rw-r--r-- | kolla/tests/etc/default.conf | 5 |
6 files changed, 0 insertions, 26 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index db28421ca..3a79a7ca0 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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', ] %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 94998cb36..e1f607ac6 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -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 diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 81ba036c0..4b8cef81b 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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' ] %} diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index 1a018a1b0..3e15043eb 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 8d90228e2..7648b04a0 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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/' diff --git a/kolla/tests/etc/default.conf b/kolla/tests/etc/default.conf index 011de75f4..442957a71 100644 --- a/kolla/tests/etc/default.conf +++ b/kolla/tests/etc/default.conf @@ -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 |