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.

Sign up for GitHub

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

Jump to bottom

Backport #30797 to 2015.8 #30888

Merged
merged 3 commits into from Feb 4, 2016
Merged

Backport #30797 to 2015.8 #30888

merged 3 commits into from Feb 4, 2016

Commits on Feb 4, 2016

  1. document the behavior if the driver is unspecified

    @rhansen @ticosax
    rhansen authored and ticosax committed Feb 4, 2016
    Copy the full SHA
    849b94e View commit details
    Browse the repository at this point in the history

  2. add additional states.dockerng.volume_present() unit tests 

    The unit tests now test for the bug fixed in the previous commit
(among other things).
    @rhansen @ticosax
    rhansen authored and ticosax committed Feb 4, 2016
    Copy the full SHA
    68b51be View commit details
    Browse the repository at this point in the history

  3. don't delete existing Docker volume if driver unspecified 

    Before, if the driver parameter wasn't specified, the dockerng state
module's volume_present() function would try to delete the volume and
recreate it.  Now it simply ignores the existing volume's driver
setting and returns success.

Note that this change assumes that if the driver is unspecified then
the user means "I don't care what the driver is", not "I care that the
driver matches the Docker default".
    @rhansen @ticosax
    rhansen authored and ticosax committed Feb 4, 2016
    Copy the full SHA
    413c47a View commit details
    Browse the repository at this point in the history