diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-03-02 12:16:13 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-03-02 12:58:55 +0100 |
| commit | e53b1fa8893bdb1a026670c7f376006dcfd94d75 (patch) | |
| tree | 4abe9ea4064f5a5625d0beaf18b92b409e77f5ae | |
| parent | 2d52f7c89baae452f3012102ac0f22a071f8f4ce (diff) | |
| download | openshift-e53b1fa8893bdb1a026670c7f376006dcfd94d75.tar.gz openshift-e53b1fa8893bdb1a026670c7f376006dcfd94d75.tar.bz2 openshift-e53b1fa8893bdb1a026670c7f376006dcfd94d75.tar.xz openshift-e53b1fa8893bdb1a026670c7f376006dcfd94d75.zip | |
oc_atomic_container: support Skopeo output
we are working on using Skopeo to copy images to the OSTree storage.
The output from atomic will be slightly different. Support also the new
version.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | roles/lib_openshift/library/oc_atomic_container.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_atomic_container.py | 4 |
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 d2620b4cc..ac48c8c70 100644 --- a/roles/lib_openshift/library/oc_atomic_container.py +++ b/roles/lib_openshift/library/oc_atomic_container.py @@ -78,7 +78,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): @@ -122,7 +122,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 20d75cb63..a0b5fc42e 100644 --- a/roles/lib_openshift/src/ansible/oc_atomic_container.py +++ b/roles/lib_openshift/src/ansible/oc_atomic_container.py @@ -14,7 +14,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): @@ -58,7 +58,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) |