Skip to content

Commit 6af2e9a

Browse files
authored
Merge pull request kubernetes#74591 from xichengliudui/fixgolint190226
fix shellcheck in test/image/...
2 parents ce4229f + a499d81 commit 6af2e9a

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@
122122
./test/images/volume/nfs/run_nfs.sh
123123
./test/images/volume/rbd/bootstrap.sh
124124
./test/images/volume/rbd/create_block.sh
125-
./test/images/volume/rbd/mon.sh
126-
./test/images/volume/rbd/osd.sh
127125
./third_party/forked/shell2junit/sh2ju.sh
128126
./third_party/intemp/intemp.sh
129127
./third_party/multiarch/qemu-user-static/register/qemu-binfmt-conf.sh

test/images/volume/rbd/mon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020

2121
# monitor setup
22-
monmaptool --create --clobber --fsid `uuidgen` --add a $1:6789 /etc/ceph/monmap
22+
monmaptool --create --clobber --fsid "$(uuidgen)" --add a "${1}":6789 /etc/ceph/monmap
2323
mkdir /var/lib/ceph/mon/ceph-a
2424
ceph-mon -i a --mkfs --monmap /etc/ceph/monmap -k /var/lib/ceph/mon/keyring
2525
cp /var/lib/ceph/mon/keyring /var/lib/ceph/mon/ceph-a

test/images/volume/rbd/osd.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020

2121
ceph osd create
22-
ceph-osd -i $1 --mkfs --mkkey
23-
ceph auth add osd.$1 osd 'allow *' mon 'allow rwx' -i /var/lib/ceph/osd/ceph-$1/keyring
24-
ceph osd crush add $1 1 root=default host=cephbox
25-
ceph-osd -i $1 -k /var/lib/ceph/osd/ceph-$1/keyring
22+
ceph-osd -i "${1}" --mkfs --mkkey
23+
ceph auth add "osd.${1}" osd 'allow *' mon 'allow rwx' -i "/var/lib/ceph/osd/ceph-${1}/keyring"
24+
ceph osd crush add "${1}" 1 root=default host=cephbox
25+
ceph-osd -i "${1}" -k "/var/lib/ceph/osd/ceph-${1}/keyring"

0 commit comments

Comments
 (0)