openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Pass NeutronMechanismDrivers parameter to prepare"

This commit is contained in:
Zuul 2018-09-27 12:24:56 +00:00 committed by Gerrit Code Review
parent f1571e6834 6450d206c6
commit 88fbde76b1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/services/container-image-prepare.j2.yaml
View File

@ -47,6 +47,12 @@ parameters:
type: comma_delimited_list
default: []
NeutronMechanismDrivers:
default: 'openvswitch'
description: |
The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list
{% for role in roles %}
# Parameters generated for {{role.name}} Role
{{role.name}}Services:
@ -89,6 +95,7 @@ outputs:
parameter_defaults:
ContainerImagePrepare: {get_param: ContainerImagePrepare}
DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
{% for role in roles %}
{{role.name}}Services: {get_param: {{role.name}}Services}
{{role.name}}Count: {get_param: {{role.name}}Count}