Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SmartOS imgadm module and state did not like docker images #48046

Merged
merged 2 commits into from Jun 12, 2018

Conversation

Projects
None yet
3 participants
@sjorge
Copy link
Contributor

commented Jun 9, 2018

What does this PR do?

This PR fixes the importing and managing of docker images on SmartOS.

What issues does this PR fix or reference?

N/a

Previous Behavior

Exceptions were encountered when trying to import docker images.

New Behavior

Docker images can now be imported and managed properly.

Tests written?

No

Commits signed with GPG?

No

Backporting

It's a rather large fix so I would prefer to keep it in develop only, although there is no functional change compared to 2018.3.x so it may be worth while pulling this in.

@sjorge sjorge changed the title [WIP] SmartOS imgadm module and state did not like docker images SmartOS imgadm module and state did not like docker images Jun 9, 2018

@sjorge sjorge force-pushed the sjorge:docker_imgadm branch from 6a7970d to 64eb66d Jun 9, 2018

@sjorge

This comment has been minimized.

Copy link
Contributor Author

commented Jun 9, 2018

I will be super busy the coming week/weekend, but smartos_vmadm should also be updated to not error on docker images. Fixing this is a requirement for smartos_vmadm, I will deal with smartos_vmadm once this is merged and I am less busy.

@sjorge

This comment has been minimized.

Copy link
Contributor Author

commented Jun 9, 2018

Lint and test failures seem to be unrelated.

@sjorge sjorge force-pushed the sjorge:docker_imgadm branch 2 times, most recently from 6949ccf to 2c0d846 Jun 10, 2018

@rallytime
Copy link
Contributor

left a comment

Some minor documentation requests from me. :)

@@ -150,25 +232,33 @@ def list_installed(verbose=False):
verbose : boolean (False)
toggle verbose output
.. versionchanged:: 2016.3.2

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

This should be Fluorine, yes?

This comment has been minimized.

Copy link
@sjorge

sjorge Jun 11, 2018

Author Contributor

Done

'''
Get the image uuid from an imported docker image
.. versionadded:: Neon

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

This should be Fluorine.

This comment has been minimized.

Copy link
@sjorge

sjorge Jun 11, 2018

Author Contributor

Done

def sources(verbose=False):
'''
Return a list of available sources

This comment has been minimized.

Copy link
@rallytime

rallytime Jun 11, 2018

Contributor

This new function, as well as all of the the other new functions below, should have a versionadded tag for Fluorine. :)

This comment has been minimized.

Copy link
@sjorge

sjorge Jun 11, 2018

Author Contributor

Done

@sjorge sjorge force-pushed the sjorge:docker_imgadm branch 2 times, most recently from b07464f to a9a9380 Jun 11, 2018

sjorge added some commits Jun 9, 2018

imgadm module does not like docker images
For a while now SmartOS has support for docker images, importing one
would make smartos_imgadm error.

Listing images with docker images installed has the same result.
imgadm states for smartos do not like docker
Like the imgadm module the imgadm states for SmartOS did not handle
 docker images. With this commit those now work as expected.
@sjorge

This comment has been minimized.

Copy link
Contributor Author

commented Jun 11, 2018

Done and rebased on develop

@cachedout
Copy link
Collaborator

left a comment

Very nice.

@rallytime
Copy link
Contributor

left a comment

👍

@rallytime rallytime merged commit 2feeeba into saltstack:develop Jun 12, 2018

4 of 10 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10599 — ABORTED
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19682 — ABORTED
Details
codeclimate 33 issues to fix
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5628 — FAILURE
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22522 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25826 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17891 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23558 — SUCCESS
Details

@sjorge sjorge deleted the sjorge:docker_imgadm branch Jun 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.