openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make nova patching parameters configurable in Nuage" into stable/newton

This commit is contained in:
Zuul 2017-11-02 21:48:44 +00:00 committed by Gerrit Code Review
parent 78c72a9e7f 287da34e9e
commit c328b6e4ed
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-nuage-config.yaml
View File

@ -28,6 +28,8 @@ parameter_defaults:
NeutronTunnelIdRanges: ''
NeutronNetworkVLANRanges: ''
NeutronVniRanges: ''
NovaPatchConfigMonkeyPatch: false
NovaPatchConfigMonkeyPatchModules: ''
NovaOVSBridge: 'default_bridge'
NeutronMetadataProxySharedSecret: 'default'
InstanceNameTemplate: 'inst-%08x'

12
puppet/services/neutron-plugin-ml2-nuage.yaml
View File

@ -55,6 +55,16 @@ parameters:
type: boolean
default: false
NovaPatchConfigMonkeyPatch:
description: Apply monkey patching or not
type: boolean
default: false
NovaPatchConfigMonkeyPatchModules:
description: List of modules/decorators to monkey patch
type: comma_delimited_list
default: ''
resources:
NeutronML2Base:
@ -80,5 +90,7 @@ outputs:
neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
nova::api::use_forwarded_for: {get_param: UseForwardedFor}
nova::patch::config::monkey_patch: {get_param: NovaPatchConfigMonkeyPatch}
nova::patch::config::monkey_patch_modules: {get_param: NovaPatchConfigMonkeyPatchModules}
step_config: |
include tripleo::profile::base::neutron::plugins::ml2