haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: the provision sentinel should be backwards compatible

This commit is contained in:
Mitchell Hashimoto 2014-03-06 09:22:53 -08:00
parent 4104f6c21f
commit adc8151a4a
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/vagrant/action/builtin/provision.rb
View File

@ -30,12 +30,31 @@ module Vagrant
ignore_sentinel = env[:provision_ignore_sentinel] ignore_sentinel = env[:provision_ignore_sentinel]
end end
sentinel_path = nil sentinel_path = nil
update_sentinel = false
if !ignore_sentinel if !ignore_sentinel
@logger.info("Checking provisioner sentinel if we should run...") @logger.info("Checking provisioner sentinel if we should run...")
sentinel_path = env[:machine].data_dir.join("action_provision") sentinel_path = env[:machine].data_dir.join("action_provision")
if sentinel_path.file? if sentinel_path.file?
if sentinel_path.read.chomp == env[:machine].id.to_s # The sentinel file is in the format of "version:data" so that
# we can remain backwards compatible with previous sentinels.
# Versions so far:
#
# Vagrant < 1.5.0: A timestamp. The weakness here was that
# if it wasn't cleaned up, it would incorrectly not provision
# new machines.
#
# Vagrant >= 1.5.0: "1.5:ID", where ID is the machine ID.
# We compare both so we know whether it is a new machine.
#
contents = sentinel_path.read.chomp
parts = contents.split(":", 2)
if parts.length == 1
@logger.info("Old-style sentinel found! Not provisioning.")
enabled = false
update_sentinel = true
elsif parts[0] == "1.5" && parts[1] == env[:machine].id.to_s
@logger.info("Sentinel found! Not provisioning.") @logger.info("Sentinel found! Not provisioning.")
enabled = false enabled = false
else else
@ -57,10 +76,12 @@ module Vagrant
@app.call(env) @app.call(env)
# Write the sentinel if we have to # Write the sentinel if we have to
if sentinel_path && !sentinel_path.file? if sentinel_path
@logger.info("Writing provisioning sentinel so we don't provision again") if update_sentinel || !sentinel_path.file?
sentinel_path.open("w") do |f| @logger.info("Writing provisioning sentinel so we don't provision again")
f.write(env[:machine].id.to_s) sentinel_path.open("w") do |f|
f.write("1.5:#{env[:machine].id}")
end
end end
end end