nise-bosh-vagrant 0.3 → 0.4

data/lib/nise-bosh-vagrant/cli.rb

@@ -25,10 +25,15 @@ EOS
 				opt :install, "Run install script after preparing the VM"
 				opt :start, "Start all jobs after installing them (implies --install)"
 				opt :memory, "Amount of memory to allocate to the VM in MB", :type => :integer, :default => 512
+				opt :preinstall, "Preinstall hook script", :type => :string
+				opt :postinstall, "Postinstall hook script", :type => :string
+				opt :address, "IP address for the VM", :type => :string, :default => "192.168.10.10"
 			end
 
 			Trollop::die :manifest, "must provide a manifest file" if opts[:manifest].nil?
 			Trollop::die :manifest, "must exist" unless File.exist?(opts[:manifest])
+			Trollop::die :preinstall, "must exist" unless opts[:preinstall].nil? || File.exist?(opts[:preinstall])
+			Trollop::die :postinstall, "must exist" unless opts[:postinstall].nil? || File.exist?(opts[:postinstall])
 
 			opts[:release] = ARGV[0]
 
@@ -40,6 +45,7 @@ EOS
 			runner = NiseBOSHVagrant::Runner.new(opts)
 			runner.generate_vagrantfile
 			runner.copy_manifest
+			runner.copy_hook_scripts
 			runner.generate_install_script
 			puts "---> Starting Vagrant VM"
 			runner.start_vm
@@ -48,8 +54,10 @@ EOS
 
 			# If instructed, install the release
 			if opts[:install]
+				runner.hook_preinstall_release
 				puts "---> Installing release"
 				runner.install_release
+				runner.hook_postinstall_release
 			end
 
 			# If instructed, start the release
@@ -60,4 +68,4 @@ EOS
 		end
 
 	end
-end
+end

data/lib/nise-bosh-vagrant/runner.rb

@@ -7,7 +7,7 @@ module NiseBOSHVagrant
 	class Runner
 
 		attr_reader :release_path, :nise_path, :scripts_path, :vagrantfile_path, :manifest_file, :manifest_copy_path, :install_script_path, 
-					:manifest_copy_name, :install_script_copy_name, :memory
+					:copy_name, :memory
 
 		def initialize(opts)
 			opts[:nise].nil? ? @nise_path = nil : @nise_path = opts[:nise]
@@ -15,10 +15,18 @@ module NiseBOSHVagrant
 			@vagrantfile_path = File.join(@release_path, "Vagrantfile")
 			@scripts_path = File.join(File.dirname(File.expand_path(__FILE__)), "../../scripts")
 			@manifest_file = opts[:manifest]
+			@preinstall_file = opts[:preinstall]
+			@postinstall_file = opts[:postinstall]
 			@memory = opts[:memory]
+			@ip_address = opts[:address]
 
-			@manifest_copy_name = '.nise-bosh-manifest.yml'
-			@install_script_copy_name = '.nise-bosh-install.sh'
+			copy_file_prefix = '.nise-bosh'
+			@copy_name = {
+				:manifest       => "#{copy_file_prefix}-manifest.yml",
+				:preinstall     => "#{copy_file_prefix}-preinstall",
+				:postinstall    => "#{copy_file_prefix}-postinstall",
+				:install_script => "#{copy_file_prefix}-install.sh",
+			}
 
 		end
 
@@ -30,10 +38,21 @@ module NiseBOSHVagrant
 		end
 
 		def copy_manifest(output_dir=@release_path, manifest_file=@manifest_file)
-			@manifest_copy_path = File.join(output_dir, @manifest_copy_name)
+			@manifest_copy_path = File.join(output_dir, @copy_name[:manifest])
 			FileUtils.cp(manifest_file, @manifest_copy_path)
 		end
 
+		def copy_hook_scripts(output_dir=@release_path, preinstall_file=@preinstall_file, postinstall_file=@postinstall_file)
+			if preinstall_file
+				@preinstall_copy_path = File.join(output_dir, @copy_name[:preinstall])
+				FileUtils.cp(preinstall_file, @preinstall_copy_path)
+			end
+			if postinstall_file
+				@postinstall_copy_path = File.join(output_dir, @copy_name[:postinstall])
+				FileUtils.cp(postinstall_file, @postinstall_copy_path)
+			end
+		end
+
 		def generate_install_script(output_dir=@release_path, manifest_file=@manifest_copy_path)
 			manifest = YAML.load_file manifest_file
 			jobs = []
@@ -52,7 +71,7 @@ module NiseBOSHVagrant
 
 
 			jobs.each do |job|
-				manifest_path = "/home/vagrant/release/#{@manifest_copy_name}"
+				manifest_path = "/home/vagrant/release/#{@copy_name[:manifest]}"
 				job_name = job
 				install_entry = install_script_erb.result(binding)
 				install_script += "#{install_entry}\n"
@@ -60,7 +79,7 @@ module NiseBOSHVagrant
 
 			install_script += ")"
 
-			@install_script_path = File.join(output_dir, @install_script_copy_name)
+			@install_script_path = File.join(output_dir, @copy_name[:install_script])
 			File.open(@install_script_path, "wb") { |f| f.write(install_script) }
 			FileUtils.chmod 0755, @install_script_path
 		end
@@ -93,9 +112,19 @@ module NiseBOSHVagrant
 			self.exec(install_cmd)
 		end
 
+		def hook_preinstall_release(release_path=@release_path)
+			hook_cmd = "cd #{release_path} ; vagrant ssh -c \"/home/vagrant/preinstall_release\""
+			self.exec(hook_cmd)
+		end
+
+		def hook_postinstall_release(release_path=@release_path)
+			hook_cmd = "cd #{release_path} ; vagrant ssh -c \"/home/vagrant/postinstall_release\""
+			self.exec(hook_cmd)
+		end
+
 		def start_release(release_path=@release_path)
 			start_cmd = "cd #{release_path} ; vagrant ssh -c \"/home/vagrant/start.sh\""
 			self.exec(start_cmd)
 		end
 	end
-end
+end

data/lib/nise-bosh-vagrant/version.rb

@@ -1,3 +1,3 @@
 module NiseBOSHVagrant
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/resources/Vagrantfile.erb

@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
     v.customize ["modifyvm", :id, "--memory", "<%= @memory %>"]
   end
 
-  config.vm.network :private_network, ip: "192.168.10.10"
+  config.vm.network :private_network, ip: "<%= @ip_address %>"
 
   <% if not @nise_path.nil? %>config.vm.synced_folder "<%= @nise_path %>", "/home/vagrant/nise_bosh"<% end %>
   config.vm.synced_folder "<%= @release_path %>", "/home/vagrant/release"

data/resources/install_release.sh.erb

@@ -1 +1 @@
-sudo PATH=$PATH bundle exec ./bin/nise-bosh --keep-monit-files -y /home/vagrant/release <%= manifest_path %> <%= job_name %>
+sudo PATH=$PATH bundle exec ./bin/nise-bosh --keep-monit-files -y -n <%= @ip_address %> /home/vagrant/release <%= manifest_path %> <%= job_name %>

data/scripts/prepare.sh

@@ -42,5 +42,14 @@ chmod +x /home/vagrant/start.sh
 cp /home/vagrant/scripts/stop.sh /home/vagrant/stop.sh
 chmod +x /home/vagrant/start.sh
 
+# Copy hook scripts
+for hook in preinstall postinstall; do
+echo ${hook}
+	if [ -f /home/vagrant/release/.nise-bosh-${hook} ]; then
+		cp /home/vagrant/release/.nise-bosh-${hook} /home/vagrant/${hook}_release
+		chmod +x /home/vagrant/${hook}_release
+	fi
+done
+
 # Copy manifest file
-cp /home/vagrant/release/.nise-bosh-manifest.yml /home/vagrant/manifest.yml
+cp /home/vagrant/release/.nise-bosh-manifest.yml /home/vagrant/manifest.yml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nise-bosh-vagrant
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1866514652364241547
+      hash: 3139040099582416769
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: