Adding configurability to the amphora image format

By adding parameter `OctaviaAmphoraImageFormat`, it adds flexibility to
select amphora image format without forcing to use the use of
`NovaEnableRbdBackend` parameter.

Change-Id: I61ae421058fa9a944b2bbbbeeccef6b738c22a7e
Closes-Bug: #1817777
This commit is contained in:
Marc Methot 2019-02-26 13:56:47 -05:00 committed by Oliver Walsh
parent c55109f3e5
commit 1a802f3ddb
2 changed files with 21 additions and 1 deletions

View File

@ -55,6 +55,12 @@ parameters:
on Red Hat Enterprise Linux).
type: string
default: ''
OctaviaAmphoraImageFormat:
default: 'qcow2'
description: Image format ('qcow2' or 'raw') of the amphora image.
type: string
constraints:
- allowed_values: ['qcow2', 'raw']
OctaviaAmphoraImageTag:
default: 'amphora-image'
description: Glance image tag for identifying the amphora image.
@ -163,6 +169,14 @@ parameters:
constraints:
- allowed_values: ['docker', 'podman']
conditions:
octavia_raw_image_check:
or:
- equals:
- get_param: OctaviaAmphoraImageFormat
- raw
- get_param: NovaEnableRbdBackend
resources:
{% if not octavia_standalone %}
default_key_pair:
@ -186,7 +200,7 @@ resources:
amp_ssh_key_data: { get_attr: [default_key_pair, public_key] }
{% endif %}
{% raw %}
amp_to_raw: { get_param: NovaEnableRbdBackend }
amp_to_raw: {if: [octavia_raw_image_check:, true, false]}
auth_username: { get_param: OctaviaUserName }
auth_password: { get_param: OctaviaPassword }
auth_project_name: { get_param: OctaviaProjectName }

View File

@ -0,0 +1,6 @@
---
features:
- |
By adding parameter `OctaviaAmphoraImageFormat`, it adds flexibility to
select amphora image format without forcing to use of the
`NovaEnableRbdBackend` parameter.