summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-05 16:51:31 -0400
committerGitHub <noreply@github.com>2017-09-05 16:51:31 -0400
commit338436926fe1ef6d089a08bfe011f0105665ab3d (patch)
treea474425a6ed5b98090ab79e1a6cbe608eafd2e83 /roles
parent91043b66d3c085e6186d7447ebd02befa09149c9 (diff)
parente53b1fa8893bdb1a026670c7f376006dcfd94d75 (diff)
downloadopenshift-338436926fe1ef6d089a08bfe011f0105665ab3d.tar.gz
openshift-338436926fe1ef6d089a08bfe011f0105665ab3d.tar.bz2
openshift-338436926fe1ef6d089a08bfe011f0105665ab3d.tar.xz
openshift-338436926fe1ef6d089a08bfe011f0105665ab3d.zip
Merge pull request #3536 from giuseppe/system-containers-skopeo
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/lib_openshift/library/oc_atomic_container.py4
-rw-r--r--roles/lib_openshift/src/ansible/oc_atomic_container.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/lib_openshift/library/oc_atomic_container.py b/roles/lib_openshift/library/oc_atomic_container.py
index 955c6313e..79bd08f4e 100644
--- a/roles/lib_openshift/library/oc_atomic_container.py
+++ b/roles/lib_openshift/library/oc_atomic_container.py
@@ -83,7 +83,7 @@ def _install(module, container, image, values_list):
if rc != 0:
return rc, out, err, False
else:
- changed = "Extracting" in out
+ changed = "Extracting" in out or "Copying blob" in out
return rc, out, err, changed
def _uninstall(module, name):
@@ -127,7 +127,7 @@ def do_update(module, container, old_image, image, values_list):
if rc != 0:
module.fail_json(rc=rc, msg=err)
else:
- changed = "Extracting" in out
+ changed = "Extracting" in out or "Copying blob" in out
module.exit_json(msg=out, changed=changed)
diff --git a/roles/lib_openshift/src/ansible/oc_atomic_container.py b/roles/lib_openshift/src/ansible/oc_atomic_container.py
index 7b81760df..454d7c4b2 100644
--- a/roles/lib_openshift/src/ansible/oc_atomic_container.py
+++ b/roles/lib_openshift/src/ansible/oc_atomic_container.py
@@ -19,7 +19,7 @@ def _install(module, container, image, values_list):
if rc != 0:
return rc, out, err, False
else:
- changed = "Extracting" in out
+ changed = "Extracting" in out or "Copying blob" in out
return rc, out, err, changed
def _uninstall(module, name):
@@ -63,7 +63,7 @@ def do_update(module, container, old_image, image, values_list):
if rc != 0:
module.fail_json(rc=rc, msg=err)
else:
- changed = "Extracting" in out
+ changed = "Extracting" in out or "Copying blob" in out
module.exit_json(msg=out, changed=changed)