From cd0b38ea3219ddabf3643f0e8968f1495d368fb1 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Fri, 22 Jun 2018 19:20:21 -0400 Subject: [PATCH] Upload amphora image in RAW format if RBD backend When deploying an overcloud with Octavia enabled, the amphora image is uploaded to Glance as QCOW2. When using the RBD backend for Glance and Nova, this causes the image to be converted to RAW on each deployment. With slower storage, this leads to load balancer creation to fail with a compute timeout exception from Octavia. This patch makes TripleO oppiniated. If Ceph is being used, it will automatically convert the QCOW2 file to RAW before uploading to Glance. The upfront cost of conversion to RAW and uploading to Glance is worth the performance improvements. Conflicts: docker/services/octavia/octavia-deployment-config.yaml Closes-Bug: #1778303 Depends-On: https://review.openstack.org/#/c/577573/ Change-Id: If36c87e783b532b1e8b368d8e18f5a83b581b933 (cherry picked from commit 6d1a5b6bc27d34ee4ef58cbce5a5e087b1736791) (cherry picked from commit cdeb05ca1fc60b4b52ea26b57fdddcdf8d294ed5) --- docker/services/octavia/octavia-deployment-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml index ce57e509f8..a67e7c7d0c 100644 --- a/docker/services/octavia/octavia-deployment-config.yaml +++ b/docker/services/octavia/octavia-deployment-config.yaml @@ -65,6 +65,10 @@ parameters: from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL) (depends on how amphora image was created). Logging in to amphorae 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: description: The name for the neutron network used for the amphora control network @@ -173,6 +177,7 @@ outputs: amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName } amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile } amp_ssh_key_data: { get_attr: [default_key_pair, public_key] } + amp_to_raw: { get_param: NovaEnableRbdBackend } auth_username: { get_param: OctaviaUserName } auth_password: { get_param: OctaviaPassword } auth_project_name: { get_param: OctaviaProjectName }