Merge "Perform docker reconfiguration on upgrade_tasks."

puppet/services/docker-registry.yaml

@@ -54,7 +54,7 @@ outputs:
         - name: Install, Configure and Run Docker Distribution
           block:
           # NOTE(bogdando): w/a https://github.com/ansible/ansible/issues/42621
-          - set_fact:
+          - set_fact: &docker_vars
               container_registry_host:
                 if:
                 - local_container_registry_is_empty
@@ -65,6 +65,13 @@ outputs:
               name: container-registry
               tasks_from: docker-distribution
       upgrade_tasks:
-        - name: Install docker packages on upgrade if missing
+        - block:
-          when: step|int == 3
+            - name: Install docker packages on upgrade if missing
-          package: name=docker-distribution state=latest
+              when: step|int == 3
+              package: name=docker-distribution state=latest
+            - set_fact: *docker_vars
+            - name: Reconfigure Docker if needed
+              include_role:
+                name: container-registry
+                tasks_from: docker
+          when: step|int = 3

puppet/services/docker.yaml

@@ -154,9 +154,15 @@ outputs:
         ovn_metadata:
           docker_additional_sockets: {get_param: DockerAdditionalSockets}
       upgrade_tasks:
-        - name: Install docker packages on upgrade if missing
+        - block:
+            - name: Install docker packages on upgrade if missing
+              package: name=docker state=latest
+            - set_fact: *docker_vars
+            - name: Reconfigure Docker if needed
+              include_role:
+                name: container-registry
+                tasks_from: docker
           when: step|int == 3
-          package: name=docker state=latest
       update_tasks:
         - name: Restart Docker when needed
           when: step|int == 2