openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Upload amphora image in RAW format if RBD backend"

Browse Source
This commit is contained in:
Zuul 2018-12-13 07:22:30 +00:00 committed by Gerrit Code Review
commit 7e94554c0e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/octavia/octavia-deployment-config.yaml
View File

@ -67,6 +67,10 @@ parameters:
from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL) from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL)
(depends on how amphora image was created). Logging in to amphorae (depends on how amphora image was created). Logging in to amphorae
provides a convenient way to e.g. debug load balancing services. provides a convenient way to e.g. debug load balancing services.
NovaEnableRbdBackend:
default: false
description: Whether to enable or not the Rbd backend for Nova
type: boolean
OctaviaControlNetwork: OctaviaControlNetwork:
description: The name for the neutron network used for the amphora description: The name for the neutron network used for the amphora
control network control network
@ -165,6 +169,7 @@ resources:
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 }
amp_ssh_key_data: { get_attr: [default_key_pair, public_key] } amp_ssh_key_data: { get_attr: [default_key_pair, public_key] }
amp_to_raw: { get_param: NovaEnableRbdBackend }
auth_username: { get_param: OctaviaUserName } auth_username: { get_param: OctaviaUserName }
auth_password: { get_param: OctaviaPassword } auth_password: { get_param: OctaviaPassword }
auth_project_name: { get_param: OctaviaProjectName } auth_project_name: { get_param: OctaviaProjectName }