Skip to content

Commit 3742b14

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Change "files" directory in etcd project"
2 parents 4bca739 + 6f962a2 commit 3742b14

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

lib/etcd3

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,18 @@ function _install_etcd {
124124
sudo mkdir -p $ETCD_DATA_DIR
125125

126126
# Download and cache the etcd tgz for subsequent use
127-
if [ ! -f "files/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then
127+
if [ ! -f "$FILES/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then
128128
ETCD_DOWNLOAD_FILE=$ETCD_NAME.tar.gz
129-
wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O files/$ETCD_DOWNLOAD_FILE
130-
echo "${ETCD_SHA256} files/${ETCD_DOWNLOAD_FILE}" > files/etcd.sha256sum
129+
wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O $FILES/$ETCD_DOWNLOAD_FILE
130+
echo "${ETCD_SHA256} $FILES/${ETCD_DOWNLOAD_FILE}" > $FILES/etcd.sha256sum
131131
# NOTE(sdague): this should go fatal if this fails
132-
sha256sum -c files/etcd.sha256sum
132+
sha256sum -c $FILES/etcd.sha256sum
133133

134-
tar xzvf files/$ETCD_DOWNLOAD_FILE -C files
135-
sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
134+
tar xzvf $FILES/$ETCD_DOWNLOAD_FILE -C $FILES
135+
sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
136136
fi
137137
if [ ! -f "$ETCD_BIN_DIR/etcd" ]; then
138-
sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
138+
sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd
139139
fi
140140
}
141141

0 commit comments

Comments
 (0)