From 3b6f7d0575a953038432123e07cb998e94126392 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Fri, 29 Nov 2019 17:06:19 +0100 Subject: [PATCH] Remove unused post update and upgrade tasks These tasks were incorrectly placed in post update and upgrade steps. They need to be moved to tripleo-ansible. See https://review.opendev.org/#/c/696727/ Closes-Bug: #1836074 Change-Id: I7da826200db1b6ac7d2a60cfa2577004d27aee17 (cherry picked from commit 531327eec91e03c23270424b1bfc263601fb7a24) --- .../octavia-health-manager-container-puppet.yaml | 12 ------------ .../octavia-housekeeping-container-puppet.yaml | 12 ------------ .../octavia/octavia-worker-container-puppet.yaml | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 503310f169..628aba1f1a 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -163,15 +163,3 @@ outputs: Log files from octavia containers can be found under /var/log/containers/octavia and /var/log/containers/httpd/octavia-api. ignore_errors: true - post_upgrade_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent - post_update_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index 0f6a0250a1..cae7db7ebc 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -163,15 +163,3 @@ outputs: /var/log/containers/octavia and /var/log/containers/httpd/octavia-api. ignore_errors: true upgrade_tasks: [] - post_upgrade_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent - post_update_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index ec0539b5b9..2513e8d32f 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -163,15 +163,3 @@ outputs: persistent: yes state: yes upgrade_tasks: [] - post_upgrade_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent - post_update_tasks: - - name: remove directory /etc/octavia/conf.d/common - when: step|int == 5 - file: - path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common" - state: absent