search

projectatomic / container-storage-setup

Service to set up storage for Docker and other container systems
Apache License 2.0
153 stars 77 forks source link

Fix get_current_storage_options to work with and without docker #221

Closed rhatdan closed 7 years ago

rhatdan commented 7 years ago

If we are using docker-storage-setup, user could set DOCKER_STORAGE_OPTIONS for all other cases it should be STORAGE_OPTIONS.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

rhatdan commented 7 years ago

Fixes https://github.com/projectatomic/container-storage-setup/issues/219

rhatdan commented 7 years ago

@rhvgoyal PTAL

rh-atomic-bot commented 7 years ago

:umbrella: The latest upstream changes (presumably 2a074ca) made this pull request unmergeable. Please resolve the merge conflicts.

rhvgoyal commented 7 years ago

@rhatdan please rebase.

rhatdan commented 7 years ago

@rhvgoyal Fixed.

rhvgoyal commented 7 years ago

LGTM

rhvgoyal commented 7 years ago

@rh-atomic-bot r+ 1c1cb90

rh-atomic-bot commented 7 years ago

:hourglass: Testing commit 1c1cb90 with merge b7c098b...

rh-atomic-bot commented 7 years ago

:sunny: Test successful - status-redhatci Approved by: rhvgoyal Pushing b7c098b051ef06e789fd5c40505f2e24b0eafce7 to master...