Merge "Mount /usr/share/openstack-octavia-amphora-images into mistral-executor"
This commit is contained in:
commit
4daeccdac7
|
@ -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
|
||||
|
|
|
@ -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: ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue