openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Adding amphora architecture to heat templates" into stable/train

This commit is contained in:
Zuul 2020-06-29 22:45:26 +00:00 committed by Gerrit Code Review
parent 5133f8f8d2 555bba7a5b
commit 52eb92bf9b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/octavia/octavia-deployment-config.j2.yaml
View File

@ -72,6 +72,10 @@ parameters:
default: 'amphora-image' default: 'amphora-image'
description: Glance image tag for identifying the amphora image. description: Glance image tag for identifying the amphora image.
type: string type: string
OctaviaAmphoraImageArchitecture:
default: 'x86_64'
description: Architecture of the amphora image.
type: string
OctaviaAmphoraSshKeyName: OctaviaAmphoraSshKeyName:
type: string type: string
default: 'octavia-ssh-key' default: 'octavia-ssh-key'
@ -224,6 +228,7 @@ resources:
amp_image_name: { get_param: OctaviaAmphoraImageName } amp_image_name: { get_param: OctaviaAmphoraImageName }
amp_image_filename: {get_param: OctaviaAmphoraImageFilename } amp_image_filename: {get_param: OctaviaAmphoraImageFilename }
amp_image_tag: { get_param: OctaviaAmphoraImageTag } amp_image_tag: { get_param: OctaviaAmphoraImageTag }
amp_hw_arch: { get_param: OctaviaAmphoraImageArchitecture }
amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName } amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName }
amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile } amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile }
{% if not octavia_standalone %} {% if not octavia_standalone %}