openstack/tripleo-heat-templates
Code Issues Proposed changes

Pass NeutronMechanismDrivers parameter to prepare

Browse Source 
This change is part of the proposal to use the value of
NeutronMechanismDrivers to determine what neutron images to prepare
(specifically whether the Opendaylight or OVN images should be
prepared).

Change-Id: I1fd78fd1eeb071788fc23ba343915ce7d6d14f02
Partial-Bug: #1794103
This commit is contained in:
Steve Baker 2018-09-25 13:52:45 +12:00
parent ab24d472f1
commit 6450d206c6
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 type: comma_delimited_list
default: [] default: []
NeutronMechanismDrivers:
default: 'openvswitch'
description: |
The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list
{% for role in roles %} {% for role in roles %}
# Parameters generated for {{role.name}} Role # Parameters generated for {{role.name}} Role
{{role.name}}Services: {{role.name}}Services:
@ -89,6 +95,7 @@ outputs:
parameter_defaults: parameter_defaults:
ContainerImagePrepare: {get_param: ContainerImagePrepare} ContainerImagePrepare: {get_param: ContainerImagePrepare}
DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress} DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
{% for role in roles %} {% for role in roles %}
{{role.name}}Services: {get_param: {{role.name}}Services} {{role.name}}Services: {get_param: {{role.name}}Services}
{{role.name}}Count: {get_param: {{role.name}}Count} {{role.name}}Count: {get_param: {{role.name}}Count}