openstack/tripleo-common
Code Issues Proposed changes

Merge "Stop installing octavia-amphora-image package"

Browse Source
This commit is contained in:
Zuul 2018-11-09 10:06:43 +00:00 committed by Gerrit Code Review
commit b031901a0e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/octavia-undercloud/tasks/main.yml
View File

@ -10,14 +10,9 @@
when: ansible_distribution == 'CentOS' and not image_filename is defined when: ansible_distribution == 'CentOS' and not image_filename is defined
- block: - block:
- name: install Octavia amphora image if Red Hat
package:
name: octavia-amphora-image
state: present
become: true
- name: set location if Red Hat - name: set location if Red Hat
set_fact: 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 when: ansible_distribution == 'RedHat' and not image_filename is defined
- name: check if amphora image file exists - name: check if amphora image file exists

8
releasenotes/notes/stop-octavia-amphora-image-install-5d26e3d37c7b508f.yaml Normal file
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.

1
sudoers
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: /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/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/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-container-image-prepare *
mistral ALL = NOPASSWD: /usr/bin/tripleo-deploy-openshift * mistral ALL = NOPASSWD: /usr/bin/tripleo-deploy-openshift *
validations ALL = NOPASSWD: ALL validations ALL = NOPASSWD: ALL