Преглед на файлове

Merge pull request #3536 from giuseppe/system-containers-skopeo

Merged by openshift-bot
OpenShift Bot преди 7 години
родител
ревизия
338436926f
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      roles/lib_openshift/library/oc_atomic_container.py
  2. 2 2
      roles/lib_openshift/src/ansible/oc_atomic_container.py

+ 2 - 2
roles/lib_openshift/library/oc_atomic_container.py

@@ -83,7 +83,7 @@ def _install(module, container, image, values_list):
     if rc != 0:
     if rc != 0:
         return rc, out, err, False
         return rc, out, err, False
     else:
     else:
-        changed = "Extracting" in out
+        changed = "Extracting" in out or "Copying blob" in out
         return rc, out, err, changed
         return rc, out, err, changed
 
 
 def _uninstall(module, name):
 def _uninstall(module, name):
@@ -127,7 +127,7 @@ def do_update(module, container, old_image, image, values_list):
     if rc != 0:
     if rc != 0:
         module.fail_json(rc=rc, msg=err)
         module.fail_json(rc=rc, msg=err)
     else:
     else:
-        changed = "Extracting" in out
+        changed = "Extracting" in out or "Copying blob" in out
         module.exit_json(msg=out, changed=changed)
         module.exit_json(msg=out, changed=changed)
 
 
 
 

+ 2 - 2
roles/lib_openshift/src/ansible/oc_atomic_container.py

@@ -19,7 +19,7 @@ def _install(module, container, image, values_list):
     if rc != 0:
     if rc != 0:
         return rc, out, err, False
         return rc, out, err, False
     else:
     else:
-        changed = "Extracting" in out
+        changed = "Extracting" in out or "Copying blob" in out
         return rc, out, err, changed
         return rc, out, err, changed
 
 
 def _uninstall(module, name):
 def _uninstall(module, name):
@@ -63,7 +63,7 @@ def do_update(module, container, old_image, image, values_list):
     if rc != 0:
     if rc != 0:
         module.fail_json(rc=rc, msg=err)
         module.fail_json(rc=rc, msg=err)
     else:
     else:
-        changed = "Extracting" in out
+        changed = "Extracting" in out or "Copying blob" in out
         module.exit_json(msg=out, changed=changed)
         module.exit_json(msg=out, changed=changed)