Merge "powervm: drop custom code"

doc/source/app-ovn.rst

@@ -97,7 +97,6 @@ Copy the nova environment overrides to
         - kvm-compute_containers
         - lxd-compute_containers
         - qemu-compute_containers
-        - powervm-compute_containers
       contains:
         - neutron_ovn_controller
         - nova_compute

releasenotes/notes/drop-powervm-5612f71e00e45277.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The custom PowerVM code has been removed as it is not tested. The
+    code in question can be replaced with the following setting;
+
+    neutron_firewall_driver: openvswitch

tasks/main.yml

@@ -92,23 +92,7 @@
   tags:
     - always
 
-- name: Set neutron target platform type
-  set_fact:
-    neutron_os_type: "powervm"
-  when:
-    - cpuinfo_contents.stdout.find('pSeries') != -1
-    - ansible_architecture == 'ppc64le'
-  tags:
-    - always
-
 - import_tasks: dependent_neutron_roles.yml
-- import_tasks: neutron_ml2_ovs_powervm.yml
-  when:
-    - neutron_os_type is defined
-    - neutron_os_type == 'powervm'
-    - neutron_plugin_type == 'ml2.ovs'
-  tags:
-    - neutron-config
 
 - import_tasks: neutron_pre_install.yml
   tags:

tasks/neutron_ml2_ovs_powervm.yml

@@ -1,26 +0,0 @@
----
-# Copyright 2016, IBM Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Override neutron ovs driver firewall type
-  set_fact:
-    neutron_ml2_conf_ini_overrides:
-      securitygroup:
-        firewall_driver: "openvswitch"
-
-- name: Override neutron ovs driver firewall
-  set_fact:
-    neutron_openvswitch_agent_ini_overrides:
-      securitygroup:
-        firewall_driver: "neutron.agent.linux.openvswitch_firewall.OVSFirewallDriver"