Merge "Enables configuring Octavia flavor by default"

This commit is contained in:
Zuul 2018-02-05 17:12:32 +00:00 committed by Gerrit Code Review
commit 065f9a6c0a
2 changed files with 13 additions and 1 deletions

View File

@ -56,7 +56,10 @@ parameters:
amphora.
type: number
OctaviaFlavorProperties:
default: {}
default:
ram : '1024'
disk : '3'
vcpus : '1'
description: Dictionary describing the nova flavor for amphora.
type: json
OctaviaManageNovaFlavor:
@ -106,8 +109,10 @@ outputs:
octavia::worker::amp_flavor_id: {get_param: OctaviaFlavorId}
octavia::worker::nova_flavor_config: {get_param: OctaviaFlavorProperties}
octavia::worker::manage_nova_flavor: {get_param: OctaviaManageNovaFlavor}
octavia::worker::nova_flavor_config: {get_param: OctaviaFlavorProperties}
octavia::certificates::client_cert: {get_param: OctaviaClientCertFile}
octavia::worker::amp_image_tag: {get_param: OctaviaAmphoraImageTag}
octavia::worker::amp_project_name: 'service'
octavia::worker::enable_ssh_access: false
-
if:

View File

@ -0,0 +1,7 @@
---
features:
- |
Default values for OctaviaFlavorProperties have been added and
OctaviaManageNovaFlavor is now enabled by default so a usable OpenStack
flavor will be available for creating Octavia load balancers immediately
after deployment.