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

The smartos state's vm_present should support docker #48282

Merged
merged 1 commit into from Jun 25, 2018

Conversation

Projects
None yet
2 participants
@sjorge
Copy link
Contributor

commented Jun 24, 2018

What does this PR do?

In follow up of the PR that added docker uuid support to the imgadm module and states... this one allows VM's to be managed based on a docker image.

What issues does this PR fix or reference?

N/a

Previous Behavior

Salt would error when specifying a docker uuid.

New Behavior

Salt does the expected thing creates the vm from the docker image.

Tests written?

No

Commits signed with GPG?

No

@sjorge sjorge changed the title The smartos state's vm_present should support docker [WIP] The smartos state's vm_present should support docker Jun 24, 2018

@sjorge

This comment has been minimized.

Copy link
Contributor Author

commented Jun 24, 2018

Hit a weird intermittent issue, investigating that now...
Fixes, user specified values should also get the json treatment.

@sjorge sjorge changed the title [WIP] The smartos state's vm_present should support docker The smartos state's vm_present should support docker Jun 24, 2018

@sjorge sjorge force-pushed the sjorge:smartosdocker branch from 0b82e08 to 459a170 Jun 24, 2018

@sjorge sjorge force-pushed the sjorge:smartosdocker branch from 459a170 to 96d67d4 Jun 24, 2018

@rallytime rallytime merged commit 7466f01 into saltstack:develop Jun 25, 2018

7 of 12 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10949 — ABORTED
Details
codeclimate 8 issues to fix
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5979 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20032 — FAILURE
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26183 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18233 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23907 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22868 — SUCCESS
Details
jenkins/pr/lint The lint job has passed
Details

@sjorge sjorge deleted the sjorge:smartosdocker branch Jun 25, 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.