openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make nova patching parameters configurable in Nuage"

Browse Source
This commit is contained in:
Jenkins 2017-09-13 08:38:21 +00:00 committed by Gerrit Code Review
commit b657e92498
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: '' NeutronTunnelIdRanges: ''
NeutronNetworkVLANRanges: '' NeutronNetworkVLANRanges: ''
NeutronVniRanges: '' NeutronVniRanges: ''
NovaPatchConfigMonkeyPatch: false
NovaPatchConfigMonkeyPatchModules: ''
NovaOVSBridge: 'default_bridge' NovaOVSBridge: 'default_bridge'
NeutronMetadataProxySharedSecret: 'default' NeutronMetadataProxySharedSecret: 'default'
InstanceNameTemplate: 'inst-%08x' InstanceNameTemplate: 'inst-%08x'

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

@ -67,6 +67,16 @@ parameters:
type: boolean type: boolean
default: false 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: resources:
NeutronML2Base: NeutronML2Base:
@ -95,5 +105,7 @@ outputs:
neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion} neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId} neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
nova::api::use_forwarded_for: {get_param: UseForwardedFor} 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: | step_config: |
include tripleo::profile::base::neutron::plugins::ml2 include tripleo::profile::base::neutron::plugins::ml2