File tree Expand file tree Collapse file tree 2 files changed +2
-13
lines changed Expand file tree Collapse file tree 2 files changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -221,16 +221,8 @@ function fetch_and_execute_delegated_payload {
221
221
222
222
# only extract a valid archive
223
223
if [[ $( tar -tzf $DELEGATED_ARCHIVE_PATH ) ]]; then
224
- if [ -d /data/delegated-init ]; then
225
- # Only extract newer tar archives
226
- TAR_MTIME=$( stat -c " %Y" $DELEGATED_ARCHIVE_PATH )
227
- DIR_MTIME=$( stat -c " %Y" /data/delegated-init)
228
- if [ $TAR_MTIME -gt $DIR_MTIME ]; then
229
- tar -xvzf $DELEGATED_ARCHIVE_PATH -C /data
230
- fi
231
- else
232
- tar -xvzf $DELEGATED_ARCHIVE_PATH -C /data
233
- fi
224
+ # TODO: (tom) Only extract newer tar archives
225
+ tar -xvzf $DELEGATED_ARCHIVE_PATH -C /
234
226
fi
235
227
236
228
# Run our delegated entry script here
Original file line number Diff line number Diff line change @@ -66,9 +66,6 @@ file_roots:
66
66
# The Salt pillar is searched for locally if file_client is set to local. If
67
67
# this is the case, and pillar data is defined, then the pillar_roots need to
68
68
# also be configured on the minion:
69
- #pillar_roots:
70
- # base:
71
- # - /srv/pillar
72
69
pillar_roots:
73
70
base:
74
71
- /opt/salt/pillar
You can’t perform that action at this time.
0 commit comments