vagrant-1cloud 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eec683827d327313151a52ada3ac6286330fa1f
-  data.tar.gz: 1d122e8b57ce0d16d7d79fffab20016ac0e6c7b8
+  metadata.gz: 0856a59309590f13a7976777462fb3d33bbe2f7e
+  data.tar.gz: 036b7db899e06fc0bed1cf48d1ff7e9afdac239c
 SHA512:
-  metadata.gz: d4f69bb3364b08aea18cb602ab6950d1bed3bdfac473c8a60660f25a5388383d1cd1225edd46d2112d5dc08ae8f5fe144d22e5b5319aaa3a4e68301b4497e8b6
-  data.tar.gz: 75de8eb60668039b7f697153bbf2ed8c6bcb1fc555933bfe96e0b4b8de34d292d8dd57c40e830a9011f299dbbdd47f150352cd8ef494c9b70d425e2b76c7747a
+  metadata.gz: d8572f8739a2403180ed09ebff71c7f73f2100d7fd4f85fd761a65fd1ea9dd0967da502b60f7c92852f92edead77ee6c54f0e93b2115374ff7cb0ce8931e46ea
+  data.tar.gz: e46a8ea7108ae23c0781ce3b265700bfb30df5004723b9917c55d3af093f812be5b1bf73d64624baf9c677968fa3eca88b093b5cab2deb2fcfd65a8c37589de3

data/lib/vagrant-1cloud/actions/private_network.rb

@@ -17,93 +17,93 @@ module VagrantPlugins
 
         def call(env)
           # check if network name is set
-          return @app.call(env) unless @machine.provider_config.net_name
-
-          lockfile = "/tmp/" + @machine.provider_config.net_name.to_s + ".lock"
-          f = File.open(lockfile, "w+")
-
-          retryable(:tries => 120, :sleep => 10) do
-            next if env[:interrupted]
-            raise 'not ready' if check_file_locked?(lockfile)
-          end
-
-          f.flock(File::LOCK_EX)
-
-          # Getting private network by name
-          result = @client.request('/network')
-          private_network = result['body'].find { |network| network['Name'] == @machine.provider_config.net_name.to_s }
-
-          # Creating private network if it doesn't exist
-          if !private_network
-            result = @client.post("/network", {
-                :Name => @machine.provider_config.net_name,
-                :IsDHCP => false,
-                :DCLocation => @machine.provider_config.region
+          return @app.call(env) unless @machine.provider_config.private_net
+
+          @machine.provider_config.private_net.each do |net, ip|
+            lockfile = "/tmp/" + net.to_s + ".lock"
+            f = File.open(lockfile, "w+")
+
+            retryable(:tries => 120, :sleep => 10) do
+              next if env[:interrupted]
+              raise 'not ready' if check_file_locked?(lockfile)
+            end
+
+            f.flock(File::LOCK_EX)
+
+            # Getting private network by name
+            result = @client.request('/network')
+            private_network = result['body'].find { |network| network['Name'] == net.to_s }
+
+            # Creating private network if it doesn't exist
+            if !private_network
+              result = @client.post("/network", {
+                  :Name => net,
+                  :IsDHCP => false,
+                  :DCLocation => @machine.provider_config.region
+              })
+              # Waiting for private network to create
+              env[:ui].info I18n.t('vagrant_1cloud.info.creating_private_network')
+              @client.wait_for_network(env, result['body']['ID'])
+
+              result = @client.request("/network/#{result['body']['ID']}")
+              private_network = result['body']
+            end
+
+            f.flock(File::LOCK_UN)
+
+            # Adding server to specified network
+            result = @client.post("/Server/#{@machine.id}/Action", {
+                :Type => "AddNetwork",
+                :NetworkID => private_network['ID']
             })
-            # Waiting for private network to create
-            env[:ui].info I18n.t('vagrant_1cloud.info.creating_private_network')
-            @client.wait_for_network(env, result['body']['ID'])
 
-            result = @client.request("/network/#{result['body']['ID']}")
-            private_network = result['body']
+            # Waiting for server to add to private network
+            env[:ui].info I18n.t('vagrant_1cloud.info.setting_private_network')
+            @client.wait_for_event(env, @machine.id, result['body']['ID'])
+
+            # refresh droplet state with provider
+            Provider.droplet(@machine, :refresh => true)
+
+            result = @client.request("/server/#{@machine.id}")
+            linked_network = result['body']['LinkedNetworks'].find { |network| network['NetworkID'] == private_network['ID'] }
+
+            if !ip
+              ip = linked_network['IP']
+            end
+
+            # override ssh username to root temporarily
+            user = @machine.config.ssh.username
+            @machine.config.ssh.username = 'root'
+
+            # set private and public network
+            @machine.communicate.execute(<<-BASH)
+                ifdown -a              
+                
+                export INTERFACE=eth0
+                export MATCHADDR=$(ifconfig -a | grep eth0 | awk '{print $NF}')
+                export MATCHID=$(udevadm info /sys/class/net/eth0 | grep P: | awk -F/ '{print $(NF-2)}')
+                /lib/udev/write_net_rules
+                
+                export INTERFACE=$(ifconfig -a | grep #{linked_network['MAC']} | awk '{print $1}')
+                export MATCHADDR=#{linked_network['MAC']}
+                export MATCHID=$(ifconfig -a | grep #{linked_network['MAC']} | awk 'system("udevadm info /sys/class/net/" $1)' | grep P: | awk -F/ '{print $(NF-2)}')
+                /lib/udev/write_net_rules
+  
+                udevadm control --reload-rules && udevadm trigger
+                
+                echo >> /etc/network/interfaces
+                ifconfig -a | grep #{linked_network['MAC']} | awk '{print "auto " $1}' >> /etc/network/interfaces
+                ifconfig -a | grep #{linked_network['MAC']} | awk '{print "iface " $1 " inet static"}' >> /etc/network/interfaces
+                echo "address #{ip}" >> /etc/network/interfaces
+                echo "netmask #{private_network['Mask']}" >> /etc/network/interfaces
+                
+                ifup -a
+            BASH
+
+            # reset username
+            @machine.config.ssh.username = user
           end
 
-          f.flock(File::LOCK_UN)
-
-          # Adding server to specified network
-          result = @client.post("/Server/#{@machine.id}/Action", {
-              :Type => "AddNetwork",
-              :NetworkID => private_network['ID']
-          })
-
-          # Waiting for server to add to private network
-          env[:ui].info I18n.t('vagrant_1cloud.info.setting_private_network')
-          @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-          # refresh droplet state with provider
-          Provider.droplet(@machine, :refresh => true)
-
-          result = @client.request("/server/#{@machine.id}")
-          linked_network = result['body']['LinkedNetworks'].find { |network| network['NetworkID'] == private_network['ID'] }
-
-          if !@machine.provider_config.private_ip
-            @machine.provider_config.private_ip = linked_network['IP']
-          end
-
-          # override ssh username to root temporarily
-          user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root'
-
-          # set private and public network
-          @machine.communicate.execute(<<-BASH)
-              ifdown -a              
-              
-              export INTERFACE=eth0
-              export MATCHADDR=$(ifconfig -a | grep eth0 | awk '{print $NF}')
-              export MATCHID=$(udevadm info /sys/class/net/eth0 | grep P: | awk -F/ '{print $(NF-2)}')
-              /lib/udev/write_net_rules
-              
-              export INTERFACE=$(ifconfig -a | grep #{linked_network['MAC']} | awk '{print $1}')
-              export MATCHADDR=#{linked_network['MAC']}
-              export MATCHID=$(ifconfig -a | grep #{linked_network['MAC']} | awk 'system("udevadm info /sys/class/net/" $1)' | grep P: | awk -F/ '{print $(NF-2)}')
-              /lib/udev/write_net_rules
-
-              udevadm control --reload-rules && udevadm trigger
-              
-              ifconfig -a | grep eth0 | awk '{print "hwaddress ether " $5}' >> /etc/network/interfaces
-              echo >> /etc/network/interfaces
-              ifconfig -a | grep #{linked_network['MAC']} | awk '{print "auto " $1}' >> /etc/network/interfaces
-              ifconfig -a | grep #{linked_network['MAC']} | awk '{print "iface " $1 " inet static"}' >> /etc/network/interfaces
-              echo "address #{@machine.provider_config.private_ip}" >> /etc/network/interfaces
-              echo "netmask #{private_network['Mask']}" >> /etc/network/interfaces
-              echo "hwaddress ether #{linked_network['MAC']}" >> /etc/network/interfaces
-              
-              ifup -a
-          BASH
-
-          # reset username
-          @machine.config.ssh.username = user
-
           @app.call(env)
         end
 

data/lib/vagrant-1cloud/config.rb

@@ -10,8 +10,7 @@ module VagrantPlugins
       attr_accessor :ram
       attr_accessor :hi_perf
       attr_accessor :ca_path
-      attr_accessor :net_name
-      attr_accessor :private_ip
+      attr_accessor :private_net
 
       def initialize
         @token              = UNSET_VALUE
@@ -23,8 +22,7 @@ module VagrantPlugins
         @ram                = UNSET_VALUE
         @hi_perf            = UNSET_VALUE
         @ca_path            = UNSET_VALUE
-        @net_name           = UNSET_VALUE
-        @private_ip         = UNSET_VALUE
+        @private_net        = UNSET_VALUE
       end
 
       def finalize!
@@ -37,8 +35,7 @@ module VagrantPlugins
         @ram                = '512' if @ram == UNSET_VALUE
         @hi_perf            = false if @hi_perf == UNSET_VALUE
         @ca_path            = nil if @ca_path == UNSET_VALUE
-        @net_name           = nil if @net_name == UNSET_VALUE
-        @private_ip         = nil if @private_ip == UNSET_VALUE
+        @private_net        = nil if @private_net == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-1cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OneCloud
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-1cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Bulat Yusupov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday