vagrant-g5k 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d54d0bd6561de0ae64704dd3d193bc33c9315c
-  data.tar.gz: cf831d202c096f406b2e5bd6fc28096f8aa041a4
+  metadata.gz: b263753a8f181ae3e7087bf0d6ff5b1fbf761d07
+  data.tar.gz: f28daaa87480bc5c97dab02f6680573fd2f2fe73
 SHA512:
-  metadata.gz: aae8a2021bc6d8aa4fa49e2c9756a896a7170dbb75b15886f47d8eeef45aa02fdcfff91309c7913948ade786b230ae91d0b06bfdbd9e1394ddae7d2ad9a121f8
-  data.tar.gz: 27845918e8cb2457d69c89a20f97dc9236473b918087fd70a1276e5692c87a790556c6353a8f15459c55851c04b6f98b62e61b45bf9e26540eea4bf1011e4740
+  metadata.gz: 6e828bf21b4b8e3f7f6513f5f9f655eaa31b5b372ada250cee510187d691f1ed7d1dc91b22b49ab1dc983b36bb2b0ea7722b522bfc5dc949da9c83da5cbe6055
+  data.tar.gz: 06c053d8fe628a8927f75c16b6899ead22a6c32c3a843b895ca50be18793af24fe2783a147812aac1ab1bb85648a0dd69dd838985f56b29c6bbace0ca4019880

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.3 
+
+  * Rsync support. The Vagrantfile needs to be updated.
+
 # 0.9.2
 
   * Make the monitor socket location unique
@@ -8,7 +12,7 @@
 
 # 0.9.0
 
-  * Code refactoring : 
+  * Code refactoring :
     * Introduce oar_driver to handle operation involving oar
     * Introduce net_driver to configure the network used by the VMs
     * Introduce disk_driver to configure the disk used by the VMs
@@ -74,7 +78,7 @@
   * SSH ports has to be forwarded explicitly
 
 # 0.0.5
-  
+
   * Add destroy command
   * Remove vmlist command
 

data/README.md

@@ -22,10 +22,33 @@ $ vagrant plugin install vagrant-g5k
 $ vagrant up --provider=g5k
 ...
 ```
+Vagrant requires a box to start with. As a consequence you can add one `dummy` box with the following command :
+
+```
+ vagrant box add dummy https://github.com/msimonin/vagrant-g5k/raw/master/dummy.box
+```
+
+
 ## Configuration
 
 Check the Vagrantfile.
 
+## Note on the insecure vagrant key
+
+By default, Vagrant uses a insecure key to connect to the VM.
+Prior to some operation vagrant will replace this by a generated key.
+This operation isn't supported by vagrant-g5k thus you need to specify
+`config.vmssh.insert_key = false` in the Vagrantfile.
+
+For instance this is needed when using shared folders, hostmanager plugin.
+
+## Note on shared folders
+
+Rsync shared folders are supported. The copy of your local files is hooked in the `up` phase. After this you can use :
+
+* `vagrant rsync` to force a synchronization
+* `vagrant rsync-auto` to watch your local modifications
+
 ## Note on disk format and backing strategy
 
 Virtual Machines can be booted either :
@@ -93,6 +116,7 @@ You can use `:cpu => -1` to express that you want all the cpu of the reserved no
 * `vagrant destroy`
 * `vagrant halt`
 * `vagrant provision`
+* `vagrant rsync|rsync-auto`
 * `vagrant ssh`
 * `vagrant ssh-config`
 * `vagrant status`

data/Vagrantfile

@@ -3,48 +3,73 @@
 #
 # Sample Vagrantfile
 #
-N = 3
 Vagrant.configure(2) do |config|
+    config.hostmanager.enabled = true
+    config.hostmanager.manage_guest = true
 
-    ## This define a VM.
-    ## a g5k provider section will override top level options
-    ## To define multiple VMs you can 
-    ## * either repeat the block
-    ## * loop over using (1..N).each block
-    (1..N).each do |i| 
-      config.vm.define "vm#{i}" do |my|
-        my.vm.box = "dummy"
-        
-        ## Access to the vm
-        ## This is specific to alpine_docker
-        ## It's better to use a vagrant image
-        ## converted to qcow2
-        my.ssh.username = "root"
-        my.ssh.password = ""
-        my.vm.provider "g5k" do |g5k|
-          g5k.project_id = "vagrant-g5k"
-          g5k.site = "lille"
-          g5k.username = ENV["USER"]
-          g5k.gateway = "access.grid5000.fr"
-          g5k.walltime = "01:00:00"
-          g5k.image = {
-            :path    => "public/alpine_docker.qcow2",
-            :backing => "snapshot"
-          }
-          g5k.net = {
-            :type => "nat",
-            :ports => ["222#{i}-:22"]
-          }
-
-          g5k.oar = "virtual != 'none'"
-
-          g5k.resources = {
-            :cpu => 1,
-            :mem => 2048
-          }
-        end #g5k
-      end
-    end
-  end
+    (0..9).each do |i|
+      config.vm.provider "g5k" do |g5k, override|
+        # This is mandatory for the shared folders to work correctly
+        override.nfs.functional = false
+        # project id must be unique accross all
+        # your projects using vagrant-g5k to avoid conflict
+        # on vm disks
+        g5k.project_id = "test-vagrant-g5k"
+
+        #g5k.site = "igrida"
+        g5k.site = "rennes"
+        g5k.username = "msimonin"
+         g5k.gateway = "access.grid5000.fr"
+        g5k.walltime = "02:00:00"
+
+        # Image backed on the frontend filesystem
+        g5k.image = {
+        #  :path    => "/udd/msimonin/precise.qcow2",
+          :path    => "/home/msimonin/public/ubuntu1404-9p.qcow2",
+          :backing => "snapshot"
+        }
+
+        ## Bridged network : this allow VMs to communicate
+        g5k.net = {
+          :type => "bridge"
+        }
 
+        ## Nat network : VMs will only have access to the external world
+        ## Forwarding ports will allow you to access services hosted inside the
+        ## VM.
+        #g5k.net = {
+        #  :type => "nat",
+        #  :ports => ["2222-:22"]
+        #}
 
+        ## OAR selection of resource
+        g5k.oar = "virtual != 'none'"
+        #g5k.oar = "virtual != 'None' and network_address in ('paranoia-2.rennes.grid5000.fr')"
+        #g5k.oar = "network_address in ('igrida12-12.irisa.fr')"
+
+        ## VM size customization default values are
+        ## cpu => -1 -> all the cpu of the reserved node
+        ## mem => -1 -> all the mem of the reserved node
+        ##
+        #g5k.resources = {
+        #  :cpu => 1,
+        #  :mem => 2048
+        #}
+      end #g5k
+
+      ## This define a VM.
+      ## a g5k provider section will override top level options
+      ## To define multiple VMs you can
+      ## * either repeat the block
+      ## * loop over using (1..N).each block
+      config.vm.define "exp#{i}" do |my|
+        my.vm.box = "dummy"
+        ## Configure the shared folders between your host and the VM
+        my.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: true
+        ## This is mandatory until #6 is fixed
+        ## In particular this is needed for the shared folders
+        my.ssh.insert_key = false
+
+      end #vm
+    end
+end

data/Vagrantfile.old

@@ -0,0 +1,72 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Sample Vagrantfile
+#
+Vagrant.configure(2) do |config|
+
+    config.vm.provider "g5k" do |g5k, override|
+      # This is mandatory for the shared folders to work correctly
+      override.nfs.functional = false
+      # project id must be unique accross all
+      # your projects using vagrant-g5k to avoid conflict
+      # on vm disks
+      g5k.project_id = "test-vagrant-g5k"
+
+      #g5k.site = "igrida"
+      g5k.site = "rennes"
+      g5k.username = "msimonin"
+       g5k.gateway = "access.grid5000.fr"
+      g5k.walltime = "00:10:00"
+
+      # Image backed on the frontend filesystem
+      g5k.image = {
+      #  :path    => "/udd/msimonin/precise.qcow2",
+        :path    => "/home/msimonin/public/ubuntu1404-9p.qcow2",
+        :backing => "snapshot"
+      }
+
+      ## Bridged network : this allow VMs to communicate
+      #g5k.net = {
+      #  :type => "bridge"
+      #}
+
+      ## Nat network : VMs will only have access to the external world
+      ## Forwarding ports will allow you to access services hosted inside the
+      ## VM.
+      g5k.net = {
+        :type => "nat",
+        :ports => ["2222-:22"]
+      }
+
+      ## OAR selection of resource
+      g5k.oar = "virtual != 'none'"
+      #g5k.oar = "virtual != 'None' and network_address in ('paranoia-2.rennes.grid5000.fr')"
+      #g5k.oar = "network_address in ('igrida12-12.irisa.fr')"
+
+      ## VM size customization default values are
+      ## cpu => -1 -> all the cpu of the reserved node
+      ## mem => -1 -> all the mem of the reserved node
+      ##
+      g5k.resources = {
+        :cpu => 1,
+        :mem => 2048
+      }
+    end #g5k
+
+    ## This define a VM.
+    ## a g5k provider section will override top level options
+    ## To define multiple VMs you can
+    ## * either repeat the block
+    ## * loop over using (1..N).each block
+    config.vm.define "exp5" do |my|
+      my.vm.box = "dummy"
+      ## Configure the shared folders between your host and the VM
+      my.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: false
+      ## This is mandatory until #6 is fixed
+      ## In particular this is needed for the shared folders
+      my.ssh.insert_key = false
+
+    end #vm
+
+end

data/lib/vagrant-g5k/action.rb

@@ -77,6 +77,8 @@ module VagrantPlugins
               b1.use ConnectG5K
               b1.use CreateLocalWorkingDir
               b1.use RunInstance # launch a new instance
+              b1.use WaitForCommunicator, [:Running]
+              b1.use SyncedFolders
             end
           end
         end

data/lib/vagrant-g5k/driver.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
           @logger.debug("Returning #{stdout}")
         }
         stdout
- 
+
       end
 
       def upload(src, dst)

data/lib/vagrant-g5k/network/nat.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
           ports = @net[:ports]
           ssh_fwd = ports.select{ |x| x.split(':')[1] == '22'}.first
           if ssh_fwd.nil?
-            env[:ui].error "SSH port 22 must be forwarded"
+            @env[:ui].error "SSH port 22 must be forwarded"
             raise Error "SSh port 22 isn't forwarded"
           end
           ssh_fwd = ssh_fwd.split('-:')[0]
@@ -61,5 +61,3 @@ module VagrantPlugins
     end
   end
 end
-
-  

data/lib/vagrant-g5k/provider.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
         return Action.send(action_method) if Action.respond_to?(action_method)
         nil
       end
-      
+
       def ssh_info
         # Run a custom action called "read_ssh_info" which does what it
         # says and puts the resulting SSH info into the `:machine_ssh_info`

data/lib/vagrant-g5k/util/launch_vm.sh

@@ -79,7 +79,7 @@ clean_shutdown() {
 trap clean_shutdown 12
 
 # Launch virtual machine
-kvm -m $VM_MEM -smp cores=$SMP,threads=1,sockets=1 -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.$OAR_JOB_ID.mon,server,nowait -localtime -enable-kvm $net $@ &
+kvm -m $VM_MEM -smp cores=$SMP,threads=1,sockets=1 -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.$OAR_JOB_ID.mon,server,nowait -localtime -enable-kvm -vnc :1,password $net $@ &
 
 wait
 

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.9.2'
+    VERSION = '0.9.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -138,6 +138,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".Vagrantfile.swp"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -145,7 +146,10 @@ files:
 - LICENSE
 - README.md
 - Vagrantfile
+- Vagrantfile.old
+- dummy.box
 - lib/vagrant-g5k.rb
+- lib/vagrant-g5k/.action.rb.swp
 - lib/vagrant-g5k/.config.rb.swp
 - lib/vagrant-g5k/action.rb
 - lib/vagrant-g5k/action/connect_g5k.rb