vagrant-1cloud 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb17fc50b50b1d2fb51b2b906e48fdfc369e667
-  data.tar.gz: b321c58f57d2eb58c5c04b637c7d63a8a1242fec
+  metadata.gz: 5eec683827d327313151a52ada3ac6286330fa1f
+  data.tar.gz: 1d122e8b57ce0d16d7d79fffab20016ac0e6c7b8
 SHA512:
-  metadata.gz: d2df9beff77ac26ebc69896402b9f1cee28ee526385f9061bf3e872a397f468e1eb51132fadc534d3853d2a7ad198c9357e208b0eec69fc00c99627611ccaf6f
-  data.tar.gz: 8a30db21c821c29a1dee964ec1aa5e7a3984a5e3ceca4ec19db8ec86135b3b051b9159645efd03134efd793d63e6e75f99488c97b4e0674faa0fcb00a803d9cc
+  metadata.gz: d4f69bb3364b08aea18cb602ab6950d1bed3bdfac473c8a60660f25a5388383d1cd1225edd46d2112d5dc08ae8f5fe144d22e5b5319aaa3a4e68301b4497e8b6
+  data.tar.gz: 75de8eb60668039b7f697153bbf2ed8c6bcb1fc555933bfe96e0b4b8de34d292d8dd57c40e830a9011f299dbbdd47f150352cd8ef494c9b70d425e2b76c7747a

data/.gitignore

@@ -10,3 +10,4 @@
 vagrant-1cloud.iml
 /.idea/
 /.svn/
+.rake_tasks~

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

@@ -54,7 +54,7 @@ module VagrantPlugins
 
           # wait for ssh to be ready
           $reboot_num = 3
-          $check_num = 20
+          $check_num = 30
           $i = 0
           while $i <= $reboot_num do
             $j = 0

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

@@ -31,7 +31,7 @@ module VagrantPlugins
 
           # wait for ssh to be ready
           $reboot_num = 3
-          $check_num = 20
+          $check_num = 30
           $i = 0
           while $i <= $reboot_num do
             $j = 0

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

@@ -1,10 +1,12 @@
 require 'vagrant-1cloud/helpers/client'
+require 'timeout'
 
 module VagrantPlugins
   module OneCloud
     module Actions
       class PrivateNetwork
         include Helpers::Client
+        include Vagrant::Util::Retryable
 
         def initialize(app, env)
           @app = app
@@ -17,15 +19,28 @@ module VagrantPlugins
           # 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
             })
+            # 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'])
 
@@ -33,11 +48,15 @@ module VagrantPlugins
             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 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'])
 
@@ -55,14 +74,31 @@ module VagrantPlugins
           user = @machine.config.ssh.username
           @machine.config.ssh.username = 'root'
 
-          # set private network
+          # 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
-              ifconfig -a | grep #{linked_network['MAC']} | awk '{system("ifdown "$1" && ifup "$1)}'
+              echo "hwaddress ether #{linked_network['MAC']}" >> /etc/network/interfaces
+              
+              ifup -a
           BASH
 
           # reset username
@@ -70,6 +106,17 @@ module VagrantPlugins
 
           @app.call(env)
         end
+
+        def check_file_locked?(file)
+          f = File.open(file, File::CREAT)
+          Timeout::timeout(0.001) { f.flock(File::LOCK_EX) }
+          f.flock(File::LOCK_UN)
+          false
+        rescue
+          true
+        ensure
+          f.close
+        end
       end
     end
   end

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

@@ -28,7 +28,7 @@ module VagrantPlugins
 
           # wait for ssh to be ready
           $reboot_num = 3
-          $check_num = 20
+          $check_num = 30
           $i = 0
           while $i <= $reboot_num do
             $j = 0

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

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

metadata

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