You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/05/21 16:16:04 UTC
[1/2] git commit: CLIMATE-437 - Remove provision-er from Vagrantfile
Repository: climate
Updated Branches:
refs/heads/master 688684fa8 -> 9e9ca1a91
CLIMATE-437 - Remove provision-er from Vagrantfile
- The VM init script requires some user input and the default Vagrant
provisioner doesn't seem to allow for that. Until a better solution is
found, the initialization script needs to be called manually after
creating the new VM. Check the documentation on the OCW wiki at [1]
for additional info.
[1] http://s.apache.org/Rxd
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/0a8e05d3
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0a8e05d3
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0a8e05d3
Branch: refs/heads/master
Commit: 0a8e05d3c79900167ab6157eb748135e734e76af
Parents: 74cacfd
Author: Michael Joyce <jo...@apache.org>
Authored: Tue May 20 11:29:50 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Tue May 20 11:29:50 2014 -0700
----------------------------------------------------------------------
ocw-vm/Vagrantfile | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/0a8e05d3/ocw-vm/Vagrantfile
----------------------------------------------------------------------
diff --git a/ocw-vm/Vagrantfile b/ocw-vm/Vagrantfile
index c0a98c6..90f41a6 100644
--- a/ocw-vm/Vagrantfile
+++ b/ocw-vm/Vagrantfile
@@ -6,16 +6,11 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "hashicorp/precise64"
-
- config.vm.provision :shell,
- :privileged => false,
- :path => "init-ocw-vm.sh"
-
- # Boot the VM into GUI mode.
+
+ #Boot the VM into GUI mode.
config.vm.provider "virtualbox" do |vb|
# Don't boot with headless mode
vb.gui = true
-
# Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "1024"]
end
[2/2] git commit: Resolve CLIMATE-437. Merge PR #34.
Posted by jo...@apache.org.
Resolve CLIMATE-437. Merge PR #34.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9e9ca1a9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9e9ca1a9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9e9ca1a9
Branch: refs/heads/master
Commit: 9e9ca1a91b89c1a47727ca24a37999e9c5918df0
Parents: 688684f 0a8e05d
Author: Michael Joyce <jo...@apache.org>
Authored: Wed May 21 07:15:20 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed May 21 07:15:20 2014 -0700
----------------------------------------------------------------------
ocw-vm/Vagrantfile | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------