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
(cherry picked from commit a38995a50d
)
This commit is contained in:
parent
e52754e1be
commit
35a3bb1468
|
@ -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 %}
|
||||||
|
|
Loading…
Reference in New Issue