Skip to content

Commit c30de19

Browse files
authored
Merge pull request #662 from github/hao/nomad-cleanup-3.0
Only run ghe-nomad-cleanup in 3.0
2 parents 7bc6c13 + 613e73e commit c30de19

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

bin/ghe-restore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,15 @@ echo "sudo restart -q memcached 2>/dev/null || true" |
408408
# config run to perform data migrations.
409409
if $CLUSTER; then
410410
echo "Configuring cluster ..."
411-
ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- ghe-nomad-cleanup"
411+
if [ "$GHE_VERSION_MAJOR" -eq "3" ]; then
412+
ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- ghe-nomad-cleanup"
413+
fi
412414
ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-config-apply" 1>&3 2>&3
413415
elif $instance_configured; then
414416
echo "Configuring appliance ..."
415-
ghe-ssh "$GHE_HOSTNAME" -- "ghe-nomad-cleanup"
417+
if [ "$GHE_VERSION_MAJOR" -eq "3" ]; then
418+
ghe-ssh "$GHE_HOSTNAME" -- "ghe-nomad-cleanup"
419+
fi
416420
ghe-ssh "$GHE_HOSTNAME" -- "ghe-config-apply" 1>&3 2>&3
417421
fi
418422

0 commit comments

Comments
 (0)