vagrant-1cloud 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adfa2a049e94d0793791807f1772dfd593616ea4
-  data.tar.gz: 5b184e38522777d486a70827bf9e1874b3f00be7
+  metadata.gz: f6b158d2a5ebd6ba2844225d9b1b8a5f01e30a36
+  data.tar.gz: 579da12b738510cdb4ec94000480543108f5c130
 SHA512:
-  metadata.gz: 682e2dcb1ea3e8d42444e5916f2e75b95e309a22407a293a0b34c726aee74cf82a3270f9adabb446d02e928e43d9f49769dea14754cf8bbb0a455b50c81a17be
-  data.tar.gz: de6930ee66c9f7c4aed590f3f38df5a041d56a7e01791c651ce124e406248f4c6d7063216b72015afd4b5df3d965485e448fd5e69c2d5695d3f4eb2c672d8b68
+  metadata.gz: cb6b3ab49082434521372f91dbc3aaecffbee9840537cd095b10712d748d9ab042e89e5ddc6418d3d0b94b766e27df6288dd52339e99250a56538f5953b115db
+  data.tar.gz: 5ebf0e8bafad0d97d9e741cb51f7171be1337c6facaacb75e46afc148e488f1e91c516fa707d8450736ffc3232e6c098cbd8090dc8a4325c9e7600bda6b1ab36

data/.gitignore

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

data/README.md

@@ -0,0 +1,115 @@
+1cloud Vagrant Provider
+==============================
+
+[![Gem](https://img.shields.io/gem/v/vagrant-1cloud.svg)](https://rubygems.org/gems/vagrant-1cloud)
+
+`vagrant-1cloud` is a Vagrant provider plugin that supports the management of [1cloud](https://1cloud.ru) VPS.
+
+Features include:
+- Create and destroy VPS
+- Power on and off VPS
+- Provision a VPS with shell
+- Setup a SSH public key for authentication
+- Create a new user account during VPS creation
+- Create private network
+- Rebuild VPS
+
+
+Install
+-------
+Install the provider plugin using the Vagrant command-line interface:
+
+`vagrant plugin install vagrant-1cloud`
+
+
+Configure
+---------
+Once the provider has been installed, you will need to configure your project to use it. See the following example for a basic multi-machine `Vagrantfile` implementation that manages two 1cloud VPS:
+
+```ruby
+Vagrant.configure('2') do |config|
+
+  config.vm.define "vps1" do |config|
+      config.vm.provider :onecloud do |provider, override|
+        override.ssh.private_key_path = '~/.ssh/id_rsa'
+        override.vm.box = 'onecloud'
+        provider.token = 'YOUR TOKEN'
+      end
+  end
+  
+  config.vm.define "vps2" do |config|
+      config.vm.provider :onecloud do |provider, override|
+        override.ssh.private_key_path = '~/.ssh/id_rsa'
+        override.vm.box = 'onecloud'
+        provider.token = 'YOUR TOKEN'
+      end
+  end
+  
+end
+```
+
+**Configuration Requirements**
+- You *must* specify the `override.ssh.private_key_path` to enable authentication with the VPS.
+- You *must* specify your 1cloud Personal Access Token at `provider.token`.
+
+**Supported Configuration Attributes**
+The following attributes are available to further configure the provider:
+- `provider.image`
+    * A string representing the image ID to use when creating a new VPS. It defaults to `7` (ubuntu-14-04-x64).
+- `provider.region`
+    * A string representing the region to create the new VPS in. It defaults to `SdnSpb`.
+- `provider.hdd`
+    * A number representing the disk space (in GB) to use when creating a new VPS (e.g. 50). It defaults to 10.
+- `provider.hdd_type`
+    * A string representing the disk type to use when creating a new VPS (e.g. `SSD`). It defaults to `SAS`.
+- `provider.cpu`
+    * A number representing the amount of cores to use when creating a new VPS (e.g. 2). It defaults to 1.
+- `provider.ram`
+    * A number representing the RAM (in MB) to use when creating a new VPS (e.g. 1024). It defaults to 512.
+- `provider.hi_perf`
+    * A boolean flag indicating whether to use high performance pool or not. It defaults to `false`.
+- `provider.private_net`
+    * A hash representing the pair that indicates the private network name and IP address of a new VPS (e.g. {"testnet" => "192.168.1.10"} or {"testnet" => nil} to set IP address automatically). VPS isn't added to private network by default.
+- `config.vm.synced_folder`
+    * Supports both rsync__args and rsync__exclude, see the [Vagrant Docs](http://docs.vagrantup.com/v2/synced-folders/rsync.html) for more information. rsync__args default to `["--verbose", "--archive", "--delete", "-z", "--copy-links"]` and rsync__exclude defaults to `[".vagrant/"]`.
+
+The provider will create a new user account with the specified SSH key for authorization if `config.ssh.username` is set.
+
+
+Run
+---
+After creating your project's `Vagrantfile` with the required configuration
+attributes described above, you may create a new VPS with the following
+command:
+
+    $ vagrant up --provider=onecloud
+
+This command will create a new VPS, setup your SSH key for authentication,
+create a new user account, and run the provisioners you have configured.
+
+**Supported Commands**
+
+The provider supports the following Vagrant sub-commands:
+- `vagrant destroy` - Destroys the VPS instance.
+- `vagrant ssh` - Logs into the VPS instance using the configured user account.
+- `vagrant halt` - Powers off the VPS instance.
+- `vagrant provision` - Runs the configured provisioners and rsyncs any specified `config.vm.synced_folder`.
+- `vagrant reload` - Reboots the VPS instance.
+- `vagrant status` - Outputs the status (active, off, not created) for the VPS instance.
+- `vagrant create-network` - Creates private network.
+- `vagrant rebuild` - Rebuilds the VPS.
+
+Troubleshooting
+---------------
+Before submitting a GitHub issue, please ensure both Vagrant and vagrant-onecloud are fully up-to-date.
+* For the latest Vagrant version, please visit the [Vagrant](https://www.vagrantup.com/) website
+* To update Vagrant plugins, run the following command: `vagrant plugin update`
+
+* `vagrant plugin install vagrant-onecloud` 
+    * Installation on OS X may not working due to a SSL certificate problem, and you may need to specify a certificate path explicitly. To do so, run `ruby -ropenssl -e "p OpenSSL::X509::DEFAULT_CERT_FILE"`. Then, add the following environment variable to your `.bash_profile` script and `source` it: `export SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem`.
+
+
+FAQ
+---
+
+* The Chef provisioner is no longer supported by default. Please use the `vagrant-omnibus` plugin to install Chef on Vagrant-managed machines. This plugin provides control over the specific version of Chef to install.

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

@@ -8,6 +8,9 @@ require 'vagrant-1cloud/actions/reload'
 require 'vagrant-1cloud/actions/setup_user'
 require 'vagrant-1cloud/actions/modify_provision_path'
 require 'vagrant-1cloud/actions/private_network'
+require 'vagrant-1cloud/actions/rebuild'
+require 'vagrant-1cloud/actions/setup_sudo'
+require 'vagrant-1cloud/actions/setup_key'
 
 module VagrantPlugins
   module OneCloud
@@ -49,6 +52,22 @@ module VagrantPlugins
         end
       end
 
+      def self.ssh_run
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Call, CheckState do |env, b|
+            case env[:machine_state]
+              when :Active
+                b.use SSHRun
+              when :off
+                env[:ui].info I18n.t('vagrant_1cloud.info.off')
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+            end
+          end
+        end
+      end
+
       def self.provision
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
@@ -78,8 +97,10 @@ module VagrantPlugins
               b.use PowerOn
               b.use provision
             when :not_created
+              b.use SetupKey
               b.use Create
               b.use PrivateNetwork
+              b.use SetupSudo
               b.use SetupUser
               b.use provision
             end
@@ -123,6 +144,24 @@ module VagrantPlugins
           end
         end
       end
+
+      def self.rebuild
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Call, CheckState do |env, b|
+            case env[:machine_state]
+              when :Active, :off
+                b.use Rebuild
+                b.use PrivateNetwork
+                b.use SetupSudo
+                b.use SetupUser
+                b.use provision
+              when :not_created
+                env[:ui].info I18n.t('vagrant_1cloud.info.not_created')
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,4 @@
 require 'vagrant-1cloud/helpers/client'
-require 'net/ssh'
 
 module VagrantPlugins
   module OneCloud
@@ -15,6 +14,8 @@ module VagrantPlugins
         end
 
         def call(env)
+          ssh_key_id = [env[:ssh_key_id]]
+
           # submit new droplet request
           result = @client.post('/server', {
             :HDD => @machine.provider_config.hdd,
@@ -24,6 +25,7 @@ module VagrantPlugins
             :DCLocation => @machine.provider_config.region,
             :ImageID => @machine.provider_config.image,
             :Name => @machine.config.vm.hostname || @machine.name,
+            :SshKeys => ssh_key_id,
             :isHighPerformance => @machine.provider_config.hi_perf
           }.delete_if { |k, v| v.nil? })
           
@@ -38,60 +40,29 @@ module VagrantPlugins
           # refresh droplet state with provider
           droplet = Provider.droplet(@machine, :refresh => true)
 
-          # add public key to machine
-          path = @machine.config.ssh.private_key_path
-          path = path[0] if path.is_a?(Array)
-          path = File.expand_path(path, @machine.env.root_path)
-          pub_key = OneCloud.public_key(path)
-          Net::SSH.start(droplet['IP'], droplet['AdminUserName'], :password => droplet['AdminPassword']) do |ssh|
-            ssh.exec!("mkdir -p ~/.ssh")
-            ssh.exec!("touch ~/.ssh/authorized_keys")
-            ssh.exec!("echo \"#{pub_key}\" >> ~/.ssh/authorized_keys")
-            ssh.exec!("chmod 600 ~/.ssh/authorized_keys")
-          end
-
           user = @machine.config.ssh.username
           @machine.config.ssh.username = 'root'
 
           # wait for ssh to be ready
-          $reboot_num = 3
-          $check_num = 30
-          $i = 0
-          while $i <= $reboot_num do
-            $j = 0
-            while !@machine.communicate.ready? && $j < $check_num do
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_off')
-              sleep 10
-              $j += 1
-            end
-
-            if $j < $check_num
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_on')
-              break
-            else
-              if $i < $reboot_num
-                # submit reboot droplet request
-                result = @client.post("/server/#{@machine.id}/action", {
-                    :Type => 'PowerReboot'
-                })
-
-                # wait for request to complete
-                env[:ui].info I18n.t('vagrant_1cloud.info.reloading')
-                @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-                $i += 1
-              else
-                raise 'No ssh connection'
-              end
-            end
-          end
+          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
+          @client.wait_for_ssh(env, 3, 30)
 
-          # change host name
+          # change authorized_keys file permissions, host name and set public network rules
           @machine.communicate.execute(<<-BASH)
+            chmod 600 ~/.ssh/authorized_keys          
+
             sed -i -e "s/127.0.1.1.*/127.0.1.1\t#{@machine.config.vm.hostname}/" /etc/hosts
             sed -i -e "s/#{droplet['IP']}.*/#{droplet['IP']}\t#{@machine.config.vm.hostname}/" /etc/hosts
             echo #{@machine.config.vm.hostname} > /etc/hostname
             hostname #{@machine.config.vm.hostname}
+
+            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
+            udevadm control --reload-rules && udevadm trigger
+            ifup -a
           BASH
 
           @machine.config.ssh.username = user

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

@@ -30,37 +30,8 @@ module VagrantPlugins
           @machine.config.ssh.username = 'root'
 
           # wait for ssh to be ready
-          $reboot_num = 3
-          $check_num = 30
-          $i = 0
-          while $i <= $reboot_num do
-            $j = 0
-            while !@machine.communicate.ready? && $j < $check_num do
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_off')
-              sleep 10
-              $j += 1
-            end
-
-            if $j < $check_num
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_on')
-              break
-            else
-              if $i < $reboot_num
-                # submit reboot droplet request
-                result = @client.post("/server/#{@machine.id}/action", {
-                    :Type => 'PowerReboot'
-                })
-
-                # wait for request to complete
-                env[:ui].info I18n.t('vagrant_1cloud.info.reloading')
-                @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-                $i += 1
-              else
-                raise 'No ssh connection'
-              end
-            end
-          end
+          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
+          @client.wait_for_ssh(env, 3, 30)
 
           @machine.config.ssh.username = user
 

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

@@ -20,36 +20,11 @@ module VagrantPlugins
           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 => 400, :sleep => 10) do
-              next if env[:interrupted]
-              raise 'Problem with lockfile' 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)
+            raise "Private network #{net} is not created" if !private_network
 
             # Adding server to specified network
             result = @client.post("/Server/#{@machine.id}/Action", {
@@ -75,20 +50,31 @@ module VagrantPlugins
             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)}')
+            # set private network rules
+            if private_network['IsDHCP']
+              @machine.communicate.execute(<<-BASH)
+                ifdown -a
+  
+                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 dhcp"}' >> /etc/network/interfaces
                 
+                ifup -a
+              BASH
+            else
+              @machine.communicate.execute(<<-BASH)
+                ifdown -a
+  
                 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
@@ -98,7 +84,8 @@ module VagrantPlugins
                 echo "netmask #{private_network['Mask']}" >> /etc/network/interfaces
                 
                 ifup -a
-            BASH
+              BASH
+            end
 
             # reset username
             @machine.config.ssh.username = user
@@ -106,17 +93,6 @@ 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/rebuild.rb

@@ -0,0 +1,78 @@
+require 'vagrant-1cloud/helpers/client'
+require 'net/ssh'
+
+module VagrantPlugins
+  module OneCloud
+    module Actions
+      class Rebuild
+        include Helpers::Client
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @client = client
+          @logger = Log4r::Logger.new('vagrant::onecloud::rebuild')
+        end
+
+        def call(env)
+
+          # submit rebuild request
+          result = @client.post("/server/#{@machine.id}/rebuild", {
+              :ImageId => @machine.provider_config.image
+          })
+
+          # assign the machine id for reference in other commands
+          @machine.id = result['body']['ID'].to_s
+
+          # wait for request to complete
+          result = @client.request("/server/#{@machine.id}/action")
+          env[:ui].info I18n.t('vagrant_1cloud.info.rebuilding')
+          @client.wait_for_event(env, @machine.id, result['body'].first['ID'])
+
+          # refresh droplet state with provider
+          droplet = Provider.droplet(@machine, :refresh => true)
+
+          user = @machine.config.ssh.username
+          @machine.config.ssh.username = 'root'
+
+          # add public key to machine
+          ssh_key_name = @machine.provider_config.ssh_key_name
+          result = @client.request('/sshkey')
+          pub_key = result['body'].find { |k| k['Title'] == ssh_key_name }
+
+          Net::SSH.start(droplet['IP'], droplet['AdminUserName'], :password => droplet['AdminPassword']) do |ssh|
+            ssh.exec!("mkdir ~/.ssh")
+            ssh.exec!("touch ~/.ssh/authorized_keys")
+            ssh.exec!("echo \"ssh-rsa #{pub_key['PublicKey']}\" >> ~/.ssh/authorized_keys")
+            ssh.exec!("chmod 600 ~/.ssh/authorized_keys")
+          end
+
+          # wait for ssh to be ready
+          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
+          @client.wait_for_ssh(env, 3, 30)
+
+          # change authorized_keys file permissions, host name and set public network rules
+          @machine.communicate.execute(<<-BASH)
+            sed -i -e "s/127.0.1.1.*/127.0.1.1\t#{@machine.config.vm.hostname}/" /etc/hosts
+            sed -i -e "s/#{droplet['IP']}.*/#{droplet['IP']}\t#{@machine.config.vm.hostname}/" /etc/hosts
+            echo #{@machine.config.vm.hostname} > /etc/hostname
+            hostname #{@machine.config.vm.hostname}
+
+            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
+            udevadm control --reload-rules && udevadm trigger
+            ifup -a
+          BASH
+
+          @machine.config.ssh.username = user
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -27,37 +27,8 @@ module VagrantPlugins
           @machine.config.ssh.username = 'root'
 
           # wait for ssh to be ready
-          $reboot_num = 3
-          $check_num = 30
-          $i = 0
-          while $i <= $reboot_num do
-            $j = 0
-            while !@machine.communicate.ready? && $j < $check_num do
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_off')
-              sleep 10
-              $j += 1
-            end
-
-            if $j < $check_num
-              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_on')
-              break
-            else
-              if $i < $reboot_num
-                # submit reboot droplet request
-                result = @client.post("/server/#{@machine.id}/action", {
-                    :Type => 'PowerReboot'
-                })
-
-                # wait for request to complete
-                env[:ui].info I18n.t('vagrant_1cloud.info.reloading')
-                @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-                $i += 1
-              else
-                raise 'No ssh connection'
-              end
-            end
-          end
+          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
+          @client.wait_for_ssh(env, 3, 30)
 
           @machine.config.ssh.username = user
 

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

@@ -0,0 +1,60 @@
+require 'vagrant-1cloud/helpers/client'
+
+module VagrantPlugins
+  module OneCloud
+    module Actions
+      class SetupKey
+        include Helpers::Client
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @client = client
+          @logger = Log4r::Logger.new('vagrant::onecloud::setup_key')
+        end
+
+        # TODO check the content of the key to see if it has changed
+        def call(env)
+          ssh_key_name = @machine.provider_config.ssh_key_name
+
+          begin
+            # assigns existing ssh key id to env for use by other commands
+            env[:ssh_key_id] = @client
+                                   .request('/sshkey')
+                                   .find_id(:body, :Title => ssh_key_name)
+
+            env[:ui].info I18n.t('vagrant_1cloud.info.using_key', {
+                :name => ssh_key_name
+            })
+          rescue Errors::ResultMatchError
+            env[:ssh_key_id] = create_ssh_key(ssh_key_name, env)
+          end
+
+          puts env[:ssh_key_id]
+
+          @app.call(env)
+        end
+
+        private
+
+        def create_ssh_key(name, env)
+          # assumes public key exists on the same path as private key with .pub ext
+          path = @machine.config.ssh.private_key_path
+          path = path[0] if path.is_a?(Array)
+          path = File.expand_path(path, @machine.env.root_path)
+          pub_key = OneCloud.public_key(path)
+
+          env[:ui].info I18n.t('vagrant_1cloud.info.creating_key', {
+              :name => name
+          })
+
+          result = @client.post('/sshkey', {
+              :Title => name,
+              :PublicKey => pub_key
+          })
+          result['body']['ID']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module VagrantPlugins
+  module OneCloud
+    module Actions
+      class SetupSudo
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @logger = Log4r::Logger.new('vagrant::onecloud::setup_sudo')
+        end
+
+        def call(env)
+          # override ssh username to root
+          user = @machine.config.ssh.username
+          @machine.config.ssh.username = 'root'
+
+          # check for guest name available in Vagrant 1.2 first
+          guest_name = @machine.guest.name if @machine.guest.respond_to?(:name)
+          guest_name ||= @machine.guest.to_s.downcase
+
+          case guest_name
+            when /debian/
+              env[:ui].info I18n.t('vagrant_1cloud.info.late_sudo_install_deb')
+              @machine.communicate.execute(<<-'BASH')
+                if [ ! -x /usr/bin/sudo ] ; then apt-get update -y && apt-get install -y sudo ; fi
+              BASH
+            when /redhat/
+              env[:ui].info I18n.t('vagrant_1cloud.info.modifying_sudo')
+
+              # disable tty requirement for sudo
+              @machine.communicate.execute(<<-'BASH')
+                sed -i'.bk' -e 's/\(Defaults\s\+requiretty\)/# \1/' /etc/sudoers
+              BASH
+          end
+
+          # reset ssh username
+          @machine.config.ssh.username = user
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module VagrantPlugins
           # create user account
           @machine.communicate.execute(<<-BASH)
             groupadd "#{user}"
-            useradd -m -d "/home/#{user}" -g "#{user}" -r "#{user}"
+            useradd -m -d "/home/#{user}" -g "#{user}" -r "#{user}" -s "/bin/bash"
             chown #{user}:#{user} -R "/home/#{user}"
           BASH
 

data/lib/vagrant-1cloud/commands/create_network.rb

@@ -0,0 +1,135 @@
+require 'optparse'
+require 'vagrant-1cloud/helpers/result'
+require 'faraday'
+require 'json'
+
+module VagrantPlugins
+  module OneCloud
+    module Commands
+      class CreateNetwork < Vagrant.plugin('2', :command)
+        include Helpers
+        include Vagrant::Util::Retryable
+
+        # Show description when `vagrant list-commands` is triggered
+        def self.synopsis
+          "plugin: vagrant-1cloud: creates new private network"
+        end
+
+        def execute
+          options = {}
+
+          optparse = OptionParser.new do |opts|
+            opts.banner = 'Usage: vagrant create-network [options]'
+
+            opts.on('-n', '--name NAME', 'Network name') do |name|
+              options[:Name] = name
+            end
+
+            options[:IsDHCP] = false
+            opts.on('-d', '--[no-]dhcp', "Use dhcp or not (default #{options[:IsDHCP]})") do |dhcp|
+              options[:IsDHCP] = dhcp
+            end
+
+            opts.on('-l', '--location LOCATION', 'Network location') do |location|
+              options[:DCLocation] = location
+            end
+
+            opts.on('-t', '--token TOKEN', '1cloud type token') do |token|
+              options[:token] = token
+            end
+
+            opts.on('-h', '--help', 'Display this screen') do
+              puts opts
+              exit
+            end
+          end
+
+          begin
+            optparse.parse!
+            mandatory = [:Name, :DCLocation, :token]
+            missing = mandatory.select{ |param| options[param].nil? }
+            unless missing.empty?
+              raise OptionParser::MissingArgument.new(missing.join(', '))
+            end
+          rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+            puts $!.to_s
+            puts optparse
+            exit
+          end
+
+          result = request(options[:token], '/network')
+          private_network = result['body'].find { |network| network['Name'] == options[:Name] }
+
+          if private_network
+            @env.ui.info I18n.t('vagrant_1cloud.info.network_exists', network: options[:Name])
+          else
+            @env.ui.info I18n.t('vagrant_1cloud.info.network_missing', network: options[:Name])
+
+            result = request(options[:token], '/network', options.except(:token), :post)
+
+            # Waiting for private network to create
+            @env.ui.info I18n.t('vagrant_1cloud.info.creating_private_network')
+            wait_for_network(options[:token], result['body']['ID'])
+          end
+
+          0
+        end
+
+        def request(token, path, params = {}, method = :get)
+          connection = Faraday.new({
+            :url => 'https://api.1cloud.ru/'
+          })
+
+          begin
+            @env.ui.info I18n.t('vagrant_1cloud.info.request', path: path)
+            @env.ui.info I18n.t('vagrant_1cloud.info.params', params: params)
+            result = connection.send(method) do |req|
+              req.url path
+              req.headers['Authorization'] = "Bearer #{token}"
+              req.body = params
+            end
+          rescue Faraday::Error::ConnectionFailed => e
+            # TODO this is suspect but because faraday wraps the exception
+            #      in something generic there doesn't appear to be another
+            #      way to distinguish different connection errors :(
+            if e.message =~ /certificate verify failed/
+              raise Errors::CertificateError
+            end
+            raise e
+          end
+
+          begin
+            body = JSON.parse(%Q[{"body":#{result.body}}])
+            @env.ui.info I18n.t('vagrant_1cloud.info.response', body: body)
+          rescue JSON::ParserError => e
+            raise(Errors::JSONError, {
+                :message => e.message,
+                :path => path,
+                :params => params,
+                :response => result.body
+            })
+          end
+
+          unless /^2\d\d$/ =~ result.status.to_s
+            raise(Errors::APIStatusError, {
+                :path => path,
+                :params => params,
+                :status => result.status,
+                :response => body.inspect
+            })
+          end
+
+          Result.new(body)
+        end
+
+        def wait_for_network(token, net_id)
+          retryable(:tries => 400, :sleep => 10) do
+            # check network status
+            result = request(token, "/network/#{net_id}")
+            raise 'Network is not active' if result['body']['State'] != 'Active'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-1cloud/commands/rebuild.rb

@@ -0,0 +1,29 @@
+require 'optparse'
+
+module VagrantPlugins
+  module OneCloud
+    module Commands
+      class Rebuild < Vagrant.plugin('2', :command)
+
+        # Show description when `vagrant list-commands` is triggered
+        def self.synopsis
+          "plugin: vagrant-1cloud: destroys and ups the vm with the same ip address"
+        end
+
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant rebuild [vm-name]'
+          end
+
+          argv = parse_options(opts)
+
+          with_target_vms(argv) do |machine|
+            machine.action(:rebuild)
+          end
+
+          0
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :hi_perf
       attr_accessor :ca_path
       attr_accessor :private_net
+      attr_accessor :ssh_key_name
 
       def initialize
         @token              = UNSET_VALUE
@@ -23,6 +24,7 @@ module VagrantPlugins
         @hi_perf            = UNSET_VALUE
         @ca_path            = UNSET_VALUE
         @private_net        = UNSET_VALUE
+        @ssh_key_name       = UNSET_VALUE
       end
 
       def finalize!
@@ -36,6 +38,7 @@ module VagrantPlugins
         @hi_perf            = false if @hi_perf == UNSET_VALUE
         @ca_path            = nil if @ca_path == UNSET_VALUE
         @private_net        = nil if @private_net == UNSET_VALUE
+        @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE
       end
 
       def validate(machine)
@@ -56,4 +59,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant-1cloud/helpers/client.rb

@@ -17,6 +17,7 @@ module VagrantPlugins
         def initialize(machine)
           @logger = Log4r::Logger.new('vagrant::onecloud::apiclient')
           @config = machine.provider_config
+          @machine = machine
           @client = Faraday.new({
             :url => 'https://api.1cloud.ru/',
             :ssl => {
@@ -25,12 +26,12 @@ module VagrantPlugins
           })
         end
 
-        def delete(path, params = {}, method = :delete)
+        def delete(path, params = {})
           @client.request :url_encoded
           request(path, params, :delete)
         end
 
-        def post(path, params = {}, method = :post)
+        def post(path, params = {})
           @client.headers['Content-Type'] = 'application/json'
           request(path, params, :post)
         end
@@ -38,6 +39,7 @@ module VagrantPlugins
         def request(path, params = {}, method = :get)
           begin
             @logger.info "Request: #{path}"
+            @logger.info "Parameters: #{params}"
             result = @client.send(method) do |req|
               req.url path
               req.headers['Authorization'] = "Bearer #{@config.token}"
@@ -104,6 +106,38 @@ module VagrantPlugins
             raise 'Network is not active' if result['body']['State'] != 'Active'
           end
         end
+
+        def wait_for_ssh(env, reboot_num, check_num)
+          i = 0
+          while i <= reboot_num do
+            j = 0
+            while !@machine.communicate.ready? && j < check_num do
+              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_off')
+              sleep 10
+              j += 1
+            end
+
+            if j < check_num
+              env[:ui].info I18n.t('vagrant_1cloud.info.ssh_on')
+              break
+            else
+              if i < reboot_num
+                # submit reboot droplet request
+                result = @client.post("/server/#{@machine.id}/action", {
+                    :Type => 'PowerReboot'
+                })
+
+                # wait for request to complete
+                env[:ui].info I18n.t('vagrant_1cloud.info.reloading')
+                @client.wait_for_event(env, @machine.id, result['body']['ID'])
+
+                i += 1
+              else
+                raise 'No ssh connection'
+              end
+            end
+          end
+        end
       end
     end
   end

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

@@ -16,6 +16,16 @@ module VagrantPlugins
         require_relative 'provider'
         Provider
       end
+
+      command(:rebuild) do
+        require_relative 'commands/rebuild'
+        Commands::Rebuild
+      end
+
+      command("create-network") do
+        require_relative 'commands/create_network'
+        Commands::CreateNetwork
+      end
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OneCloud
-    VERSION = '1.0.7'
+    VERSION = '1.0.8'
   end
 end

data/locales/en.yml

@@ -1,21 +1,32 @@
 en:
   vagrant_1cloud:
     info:
-      off: "Droplet is off"
-      not_created: "Droplet has not been created"
-      already_active: "Droplet is already active"
-      already_off: "Droplet is already off"
-      creating: "Creating a new droplet..."
-      destroying: "Destroying the droplet..."
-      shutting_down: "Shutting down the droplet..."
-      powering_off: "Powering off the droplet..."
-      powering_on: "Powering on the droplet..."
-      reloading: "Rebooting the droplet..."
+      off: "VPS is off"
+      not_created: "VPS has not been created"
+      already_active: "VPS is already active"
+      already_off: "VPS is already off"
+      creating: "Creating a new VPS..."
+      destroying: "Destroying the VPS..."
+      shutting_down: "Shutting down the VPS..."
+      powering_off: "Powering off the VPS..."
+      powering_on: "Powering on the VPS..."
+      rebuilding: "Rebuilding the VPS..."
+      reloading: "Rebooting the VPS..."
       creating_user: "Creating user account: %{user}..."
+      late_sudo_install_deb:  "1clouds's debian image lacks sudo. Installing now."
+      modifying_sudo: "Modifying sudoers file to remove tty requirement..."
+      using_key: "Using existing SSH key: %{name}"
+      creating_key: "Creating new SSH key: %{name}..."
       setting_private_network: "Setting private network..."
       creating_private_network: "Creating private network..."
+      ssh: "Waiting for ssh to be ready"
       ssh_off: "ssh connection is off"
       ssh_on: "ssh connection is on"
+      network_exists: "Private network %{network} already exists"
+      network_missing: "Private network %{network} is missing"
+      request: "Request: %{path}"
+      params: "Parameters: %{params}"
+      response: "Response: %{body}"
     config:
       token: "Token is required"
       private_key: "SSH private key path is required"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-1cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Bulat Yusupov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - lib/vagrant-1cloud.rb
 - lib/vagrant-1cloud/actions.rb
@@ -72,9 +73,14 @@ files:
 - lib/vagrant-1cloud/actions/power_off.rb
 - lib/vagrant-1cloud/actions/power_on.rb
 - lib/vagrant-1cloud/actions/private_network.rb
+- lib/vagrant-1cloud/actions/rebuild.rb
 - lib/vagrant-1cloud/actions/reload.rb
+- lib/vagrant-1cloud/actions/setup_key.rb
+- lib/vagrant-1cloud/actions/setup_sudo.rb
 - lib/vagrant-1cloud/actions/setup_user.rb
 - lib/vagrant-1cloud/actions/shut_down.rb
+- lib/vagrant-1cloud/commands/create_network.rb
+- lib/vagrant-1cloud/commands/rebuild.rb
 - lib/vagrant-1cloud/config.rb
 - lib/vagrant-1cloud/errors.rb
 - lib/vagrant-1cloud/helpers/client.rb
@@ -108,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage 1cloud droplets. Based on https://github.com/devopsgroup-io/vagrant-digitalocean.