From 70162488bf86b436db3f0b8a692ef51e907716d1 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Wed, 31 Oct 2018 18:54:29 +0100 Subject: [PATCH] Mount /usr/share/openstack-octavia-amphora-images into mistral-executor With containerized undercloud, the Octavia playbook shipping with tripleo-common can no longer install the octavia-amphora-image RPM available in RHOSP-based environments as the yum repository list is empty. Thus, the amphora QCOW2 file needs to be made available by the undercloud base OS via a volume mount. This will also help in uniformizing default placement of amphora images across different OpenStack distributions. Change Icae47e76f71b739cf0e1f5633b15432fd531e645 will close the loop. Partial-Bug: #1800916 Change-Id: I84943a5e6e2b08baaf8e61a1cd9f2fe92286ad9a --- docker/services/mistral-executor.yaml | 5 +++++ .../octavia/octavia-deployment-config.yaml | 8 +++++--- environments/undercloud.yaml | 1 + ...-mount-amphora-images-dir-31da44a544628687.yaml | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index 3a10191691..d37e427013 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -158,6 +158,11 @@ outputs: path: /usr/share/ceph-ansible state: directory setype: svirt_sandbox_file_t + - name: create octavia-amphora-images directory + file: + path: /usr/share/openstack-octavia-amphora-images + state: directory + setype: svirt_sandbox_file_t upgrade_tasks: - when: step|int == 0 tags: common diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml index 0201fbe932..3df6c6ea50 100644 --- a/docker/services/octavia/octavia-deployment-config.yaml +++ b/docker/services/octavia/octavia-deployment-config.yaml @@ -42,10 +42,12 @@ parameters: type: string default: '' OctaviaAmphoraImageFilename: - description: Filename for the amphora image. Using the default of an empty - string will cause a distro specific default to be used. (e.g. + description: Filename for the amphora image. Image files are expected to be + located in directory /usr/share/openstack-octavia-amphora-images. + 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 CentOS and /usr/share/openstack-octavia-amphora-images/octavia-amphora.qcow2 on Red Hat Enterprise Linux). type: string default: '' diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index f590095eb3..b7e3eb9fb4 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -146,5 +146,6 @@ parameter_defaults: connect_timeout: 60 MistralExecutorExtraVolumes: - /usr/share/ceph-ansible:/usr/share/ceph-ansible:ro + - /usr/share/openstack-octavia-amphora-images:/usr/share/openstack-octavia-amphora-images:ro NeutronMetadataProxySharedSecret: '' MetadataNATRule: true diff --git a/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml b/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml new file mode 100644 index 0000000000..764f2ce3d8 --- /dev/null +++ b/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml @@ -0,0 +1,14 @@ +--- +upgrade: + - | + Octavia amphora images are now expected to be located in directory + /usr/share/openstack-octavia-amphora-images on the undercloud node + for uniformization across different OpenStack distributions. +deprecations: + - | + Ensure Octavia amphora image files are placed in directory + /usr/share/openstack-octavia-amphora-images on the undercloud node. +fixes: + - | + Fix an issue where Octavia amphora images were not accessible during + overcloud deployment.