vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Also refactor setting flags for running kpod

Browse source 
* Remove duplicate definitions of storage-related flags for kpod, since
  we set them in helpers.bash now, and the other locations that were
  also setting it were doing so after loading the definitions in
  helpers.
* Set kpod storage flags after checking if we need to force use of the
  "vfs" storage driver for cri-o, to make sure kpod also ends up with
  the same override if we're using one.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-09-28 12:51:35 -04:00 • committed by umohnani8
parent e16bb3feb3
commit 2491d38e03
8 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/kpod_wait.bats
View file

@ -3,10 +3,6 @@
load helpers
IMAGE="redis:alpine"
ROOT="$TESTDIR/crio"
RUNROOT="$TESTDIR/crio-run"
KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
# Returns the POD ID
function pod_run_from_template(){