From 58d6dc3bcfaff140e4d874ac26b814f2162b6a32 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Mar 2019 18:51:45 +0000 Subject: [PATCH] Don't pull images during upgrade When adding the rolling upgrade support, some upgrade procedures were modified to pull images explicitly. This is done inconsistently between services, and is a change in behaviour from Rocky and earlier releases. This change removes all image pulling from upgrade tasks. Change-Id: Id0fed17714235e1daed60b83b1f30620f097eb97 --- ansible/roles/cinder/tasks/upgrade.yml | 7 +------ ansible/roles/glance/tasks/rolling_upgrade.yml | 6 ------ ansible/roles/ironic/tasks/rolling_upgrade.yml | 2 -- ansible/roles/neutron/tasks/rolling_upgrade.yml | 2 -- ansible/roles/nova/tasks/rolling_upgrade.yml | 2 -- ansible/roles/swift/tasks/rolling_upgrade.yml | 2 -- 6 files changed, 1 insertion(+), 20 deletions(-) diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index 248becb95f..79865c7774 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -1,16 +1,11 @@ --- -# NOTE (duonghq): I break pull and config into 2 phases to prevent new version +# NOTE (duonghq): I break config into 2 phases to prevent new version # of service start if node or process in node crash accidentally. -- include_tasks: pull.yml - when: inventory_hostname == groups["cinder-api"][0] - - include_tasks: config.yml when: inventory_hostname == groups["cinder-api"][0] - include_tasks: bootstrap_service.yml -- include_tasks: pull.yml - - include_tasks: config.yml - name: Flush handlers diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index fdf806187b..d4675c304d 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -3,9 +3,6 @@ glance_upgrading: True # Upgrade first node (NEW NODE in the Glance documentation) -- include_tasks: pull.yml - when: inventory_hostname == groups["glance-api"][0] - - include_tasks: config.yml when: inventory_hostname == groups["glance-api"][0] @@ -74,9 +71,6 @@ - Restart glance-api container # Upgrade remaining node -- include_tasks: pull.yml - when: inventory_hostname != groups["glance-api"][0] - - include_tasks: config.yml when: inventory_hostname != groups["glance-api"][0] diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml index d17b12b4f5..2634c2563c 100644 --- a/ansible/roles/ironic/tasks/rolling_upgrade.yml +++ b/ansible/roles/ironic/tasks/rolling_upgrade.yml @@ -1,6 +1,4 @@ --- -- include_tasks: pull.yml - # Pin release version - include_tasks: config.yml vars: diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml index f826c6a9bb..4e37fb84c9 100644 --- a/ansible/roles/neutron/tasks/rolling_upgrade.yml +++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml @@ -1,6 +1,4 @@ --- -- include_tasks: pull.yml - - include_tasks: config.yml - include_tasks: config-neutron-fake.yml diff --git a/ansible/roles/nova/tasks/rolling_upgrade.yml b/ansible/roles/nova/tasks/rolling_upgrade.yml index 1d016009b2..76ed9c56cd 100644 --- a/ansible/roles/nova/tasks/rolling_upgrade.yml +++ b/ansible/roles/nova/tasks/rolling_upgrade.yml @@ -1,7 +1,5 @@ --- # Create new set of configs on nodes -- include_tasks: pull.yml - - include_tasks: config.yml - include_tasks: bootstrap_service.yml diff --git a/ansible/roles/swift/tasks/rolling_upgrade.yml b/ansible/roles/swift/tasks/rolling_upgrade.yml index 8e8ca462e7..dbaa395c17 100644 --- a/ansible/roles/swift/tasks/rolling_upgrade.yml +++ b/ansible/roles/swift/tasks/rolling_upgrade.yml @@ -1,6 +1,4 @@ --- -- include_tasks: pull.yml - # Upgrade swift storage nodes first - include_tasks: config.yml when: inventory_hostname in groups['swift-account-server'] or