From 411514dea3f993f3c49a4415582f2afdbce857d2 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Tue, 8 May 2018 16:41:48 +0200
Subject: [PATCH] Install Octavia amphora image if Red Hat

For a one-click deployment, the Octavia amphora image must be present in
the undercloud node. Currently users need to ensure the image file
exists before overcloud deployment. For Red Hat-based deployments, the
image is provided by package octavia-amphora-image. Thus the package
should be installed for a better user experience leading to a truly
one-click deployment.

Closes-Bug: #1770117
Change-Id: I3ed8144b52ba528f449a4abe5c2106a5c61f9d61
---
 playbooks/roles/octavia-undercloud/tasks/main.yml     | 11 ++++++++---
 ...ctavia-amphora-image-red-hat-bc8545e36d88f951.yaml |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/install-octavia-amphora-image-red-hat-bc8545e36d88f951.yaml

diff --git a/playbooks/roles/octavia-undercloud/tasks/main.yml b/playbooks/roles/octavia-undercloud/tasks/main.yml
index 6b7d352a7..785c517fc 100644
--- a/playbooks/roles/octavia-undercloud/tasks/main.yml
+++ b/playbooks/roles/octavia-undercloud/tasks/main.yml
@@ -9,9 +9,14 @@
       image_filename: "/usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2"
     when: ansible_distribution == 'CentOS' and not image_filename is defined
 
-  - name: set location if Red Hat
-    set_fact:
-      image_filename: "/usr/share/rhosp-director-images/octavia-amphora.qcow2"
+  - block:
+      - name: install Octavia amphora image if Red Hat
+        yum:
+          name: octavia-amphora-image
+          state: latest
+      - name: set location if Red Hat
+        set_fact:
+          image_filename: "/usr/share/rhosp-director-images/octavia-amphora.qcow2"
     when: ansible_distribution == 'RedHat' and not image_filename is defined
 
   - name: check if amphora image file exists
diff --git a/releasenotes/notes/install-octavia-amphora-image-red-hat-bc8545e36d88f951.yaml b/releasenotes/notes/install-octavia-amphora-image-red-hat-bc8545e36d88f951.yaml
new file mode 100644
index 000000000..d7824166f
--- /dev/null
+++ b/releasenotes/notes/install-octavia-amphora-image-red-hat-bc8545e36d88f951.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Install Octavia amphora image on the undercloud if Red Hat.