Merge "Don't pull images during upgrade"

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

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]
 

ansible/roles/ironic/tasks/rolling_upgrade.yml

@@ -1,6 +1,4 @@
 ---
-- include_tasks: pull.yml
-
 # Pin release version
 - include_tasks: config.yml
   vars:

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

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

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