Stop installing octavia-amphora-image package

With containerized undercloud deployments, the octavia-amphora-image RPM
can no longer be installed in RHOSP-based environments as the playbook
runs in mistral_engine container and the syum repository list within it
is empty. This patch, together with the dependent change, fix that
issue.

Closes-Bug: #1800916

Depends-On: https://review.openstack.org/#/c/614609/
Change-Id: Icae47e76f71b739cf0e1f5633b15432fd531e645
(cherry picked from commit f9389e32b1)
This commit is contained in:
Carlos Goncalves 2018-10-31 21:38:44 +01:00 committed by Nir Magnezi
parent 7ba229abb2
commit 040849c677
3 changed files with 9 additions and 7 deletions

View File

@ -10,14 +10,9 @@
when: ansible_distribution == 'CentOS' and not image_filename is defined
- block:
- name: install Octavia amphora image if Red Hat
package:
name: octavia-amphora-image
state: present
become: true
- name: set location if Red Hat
set_fact:
image_filename: "/usr/share/rhosp-director-images/octavia-amphora.qcow2"
image_filename: "/usr/share/openstack-octavia-amphora-images/octavia-amphora.qcow2"
when: ansible_distribution == 'RedHat' and not image_filename is defined
- name: check if amphora image file exists

View File

@ -0,0 +1,8 @@
---
upgrade:
- |
Package octavia-amphora-image (RHEL) will no longer be installed by role
octavia-undercloud, and it now installs image files in directory
/usr/share/openstack-octavia-amphora-images/. Please ensure you have the
latest package version installed in the undercloud node beforehand
deploying or updating the overcloud.

View File

@ -9,7 +9,6 @@ mistral ALL = NOPASSWD: /usr/bin/rm -f /tmp/validations_identity_[A-Za-z0-9_][A-
mistral ALL = NOPASSWD: /bin/nova-manage cell_v2 discover_hosts *
mistral ALL = NOPASSWD: /usr/bin/tar --xattrs --ignore-failed-read -C / -cf /var/tmp/undercloud-backup-*.tar *
mistral ALL = NOPASSWD: /usr/bin/chown mistral. /var/tmp/undercloud-backup-*/filesystem-*.tar
mistral ALL = NOPASSWD: /usr/bin/yum -y install octavia-amphora-image
mistral ALL = NOPASSWD: /usr/bin/tripleo-container-image-prepare *
mistral ALL = NOPASSWD: /usr/bin/tripleo-deploy-openshift *
validations ALL = NOPASSWD: ALL