Function "_install_etcd" is trying to use "files" directory
to download a file. Instead of this, this directory should be
$FILES, which is defined previously in parent script.
TrivialFix
Change-Id: I643ce3b9aba1f65f03524430c748bf120d071509
| ... | ... |
@@ -123,18 +123,18 @@ function _install_etcd {
|
| 123 | 123 |
sudo mkdir -p $ETCD_DATA_DIR |
| 124 | 124 |
|
| 125 | 125 |
# Download and cache the etcd tgz for subsequent use |
| 126 |
- if [ ! -f "files/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then |
|
| 126 |
+ if [ ! -f "$FILES/etcd-$ETCD_VERSION-linux-$ETCD_ARCH/etcd" ]; then |
|
| 127 | 127 |
ETCD_DOWNLOAD_FILE=$ETCD_NAME.tar.gz |
| 128 |
- wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O files/$ETCD_DOWNLOAD_FILE |
|
| 129 |
- echo "${ETCD_SHA256} files/${ETCD_DOWNLOAD_FILE}" > files/etcd.sha256sum
|
|
| 128 |
+ wget $ETCD_DOWNLOAD_URL/$ETCD_VERSION/$ETCD_DOWNLOAD_FILE -O $FILES/$ETCD_DOWNLOAD_FILE |
|
| 129 |
+ echo "${ETCD_SHA256} $FILES/${ETCD_DOWNLOAD_FILE}" > $FILES/etcd.sha256sum
|
|
| 130 | 130 |
# NOTE(sdague): this should go fatal if this fails |
| 131 |
- sha256sum -c files/etcd.sha256sum |
|
| 131 |
+ sha256sum -c $FILES/etcd.sha256sum |
|
| 132 | 132 |
|
| 133 |
- tar xzvf files/$ETCD_DOWNLOAD_FILE -C files |
|
| 134 |
- sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd |
|
| 133 |
+ tar xzvf $FILES/$ETCD_DOWNLOAD_FILE -C $FILES |
|
| 134 |
+ sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd |
|
| 135 | 135 |
fi |
| 136 | 136 |
if [ ! -f "$ETCD_BIN_DIR/etcd" ]; then |
| 137 |
- sudo cp files/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd |
|
| 137 |
+ sudo cp $FILES/$ETCD_NAME/etcd $ETCD_BIN_DIR/etcd |
|
| 138 | 138 |
fi |
| 139 | 139 |
} |
| 140 | 140 |
|