openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Resource name correction" into stable/queens

This commit is contained in:
Zuul 2018-04-05 19:37:56 +00:00 committed by Gerrit Code Review
parent daacf30bbe 8fece3d048
commit 43785afc62
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ parameters:
resources:
NeutronML2Base:
NeutronMl2Base:
type: ./neutron-plugin-ml2.yaml
properties:
ServiceData: {get_param: ServiceData}
@ -96,7 +96,7 @@ outputs:
service_name: neutron_plugin_ml2_nuage
config_settings:
map_merge:
- get_attr: [NeutronML2Base, role_data, config_settings]
- get_attr: [NeutronMl2Base, role_data, config_settings]
- neutron::plugins::ml2::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
neutron::plugins::ml2::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp}
neutron::plugins::ml2::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername}