Merge "Added the ability to disable Mellanox SDN sync"

This commit is contained in:
Zuul 2019-11-11 18:16:10 +00:00 committed by Gerrit Code Review
commit f2a95da347
2 changed files with 5 additions and 0 deletions

View File

@ -48,6 +48,9 @@ parameters:
description: SDN server domain description: SDN server domain
type: string type: string
default: 'cloudx' default: 'cloudx'
MlnxSDNSyncEnabled:
type: boolean
default: true
MultiInterfaceEnabled: MultiInterfaceEnabled:
type: boolean type: boolean
default: false default: false
@ -83,6 +86,7 @@ outputs:
neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_password: {get_param: MlnxSDNPassword} neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_password: {get_param: MlnxSDNPassword}
neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_url: {get_param: MlnxSDNUrl} neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_url: {get_param: MlnxSDNUrl}
neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_domain: {get_param: MlnxSDNDomain} neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sdn_domain: {get_param: MlnxSDNDomain}
neutron::plugins::ml2::mellanox::mlnx_sdn_assist::sync_enabled: {get_param: MlnxSDNSyncEnabled}
- -
if: if:
- multi_interface_enabled - multi_interface_enabled

View File

@ -9,6 +9,7 @@ parameter_defaults:
#MlnxSDNPassword: #MlnxSDNPassword:
MlnxSDNUrl: 'sdn_url' MlnxSDNUrl: 'sdn_url'
MlnxSDNDomain: 'cloudx' MlnxSDNDomain: 'cloudx'
MlnxSDNSyncEnabled: true
NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin' NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin'
NeutronMechanismDrivers: ['mlnx_sdn_assist','sriovnicswitch','openvswitch'] NeutronMechanismDrivers: ['mlnx_sdn_assist','sriovnicswitch','openvswitch']