From a38995a50da371b1e4ba43fecbfc187762963aef Mon Sep 17 00:00:00 2001 From: Trevor Vardeman Date: Mon, 1 Jun 2020 21:22:11 +0000 Subject: [PATCH] Adding amphora architecture to heat templates Adding a change to the octavia deployment config to specify an amphora architecture. Default to x86_64. Change-Id: I886cf9ac4d5686500da3c4412ca6fe5660a651ee --- deployment/octavia/octavia-deployment-config.j2.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index 86c5705574..ff8295463d 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -72,6 +72,10 @@ parameters: default: 'amphora-image' description: Glance image tag for identifying the amphora image. type: string + OctaviaAmphoraImageArchitecture: + default: 'x86_64' + description: Architecture of the amphora image. + type: string OctaviaAmphoraSshKeyName: type: string default: 'octavia-ssh-key' @@ -217,6 +221,7 @@ resources: amp_image_name: { get_param: OctaviaAmphoraImageName } amp_image_filename: {get_param: OctaviaAmphoraImageFilename } amp_image_tag: { get_param: OctaviaAmphoraImageTag } + amp_hw_arch: { get_param: OctaviaAmphoraImageArchitecture } amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName } amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile } {% if not octavia_standalone %}