Octavia amphora image handling updates
This patch changes some defaults that turned out to be not very good in
practice to be empty values. The default behavior is instead
distribution specific behavior in the ansible playbooks.
Change-Id: Ib5338d0fadc9c1c8fcf73c53e4364d35a5f29fe7
Related-Bug: #1754039
Depends-On: https://review.openstack.org/#/c/562019/
(cherry picked from commit 4d8a80f386
)
This commit is contained in:
parent
f11b612b71
commit
81e68b02d6
|
@ -36,13 +36,19 @@ parameters:
|
|||
type: string
|
||||
default: 'tripleo.octavia_post.v1.octavia_post_deploy'
|
||||
OctaviaAmphoraImageName:
|
||||
description: The glance image name used when spawning amphorae
|
||||
description: The glance image name used when spawning amphorae. Default
|
||||
is an empty string which will use the file name as the image
|
||||
name.
|
||||
type: string
|
||||
default: 'octavia-amphora'
|
||||
default: ''
|
||||
OctaviaAmphoraImageFilename:
|
||||
description: Filename for the amphora image
|
||||
description: Filename for the amphora image. Using the default of an empty
|
||||
string will cause a distro specific default to be used. (e.g.
|
||||
/usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2
|
||||
on CentOS and /usr/share/rhosp-director-images/octavia-amphora.qcow2
|
||||
on Red Hat Enterprise Linux).
|
||||
type: string
|
||||
default: '/usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2'
|
||||
default: ''
|
||||
OctaviaAmphoraImageTag:
|
||||
default: 'amphora-image'
|
||||
description: Glance image tag for identifying the amphora image.
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The Octavia amphora image name is now derived from the filename by default so the
|
||||
`OctaviaAmphoraImageName` now behaves as an override if set to a non-default value.
|
||||
- The Octavia amphora image file name default value is now an empty string resulting
|
||||
in a distribution specific default location being used. The
|
||||
`OctaviaAmphoraImageFilename` parameter now behaves as an override if set to a
|
||||
non-default value.
|
Loading…
Reference in New Issue