powervm: drop custom code
The PowerVM driver has been deprecated in os_nova. The code in question here can be replaced with the following setting; neutron_firewall_driver: openvswitch Change-Id: Id8c4b017adb8cbf6e7264bba8cde3a82bdb7ee7a
This commit is contained in:
parent
aa78fce9a5
commit
d146f6e6ca
@ -97,7 +97,6 @@ Copy the nova environment overrides to
|
|||||||
- kvm-compute_containers
|
- kvm-compute_containers
|
||||||
- lxd-compute_containers
|
- lxd-compute_containers
|
||||||
- qemu-compute_containers
|
- qemu-compute_containers
|
||||||
- powervm-compute_containers
|
|
||||||
contains:
|
contains:
|
||||||
- neutron_ovn_controller
|
- neutron_ovn_controller
|
||||||
- nova_compute
|
- nova_compute
|
||||||
|
7
releasenotes/notes/drop-powervm-5612f71e00e45277.yaml
Normal file
7
releasenotes/notes/drop-powervm-5612f71e00e45277.yaml
Normal file
@ -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
|
@ -92,23 +92,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- always
|
- 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: 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
|
- import_tasks: neutron_pre_install.yml
|
||||||
tags:
|
tags:
|
||||||
|
@ -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"
|
|
Loading…
Reference in New Issue
Block a user