vagrant-1cloud 1.1.1 → 1.1.2

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

@@ -1,31 +0,0 @@
-require 'vagrant-1cloud/helpers/client'
-
-module VagrantPlugins
-  module OneCloud
-    module Actions
-      class Destroy
-        include Helpers::Client
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::onecloud::destroy')
-        end
-
-        def call(env)
-          # submit destroy droplet request
-          @client.delete("/server/#{@machine.id}")
-
-          env[:ui].info I18n.t('vagrant_1cloud.info.destroying')
-          @client.wait_for_destroy(env, @machine.id)
-
-          # set the machine id to nil to cleanup local vagrant state
-          @machine.id = nil
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-module VagrantPlugins
-  module OneCloud
-    module Actions
-      class ModifyProvisionPath
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger =
-            Log4r::Logger.new('vagrant::onecloud::modify_provision_path')
-        end
-
-        def call(env)
-          # check if provisioning is enabled
-          enabled = true
-          enabled = env[:provision_enabled] if env.has_key?(:provision_enabled)
-          return @app.call(env) if !enabled
-
-          username = @machine.ssh_info()[:username]
-
-          # change ownership of the provisioning path recursively to the
-          # ssh user
-          #
-          # TODO submit patch to vagrant to set appropriate permissions
-          # based on ssh username
-          @machine.config.vm.provisioners.each do |provisioner|
-            cfg = provisioner.config
-            path = cfg.upload_path if cfg.respond_to? :upload_path
-            path = cfg.provisioning_path if cfg.respond_to? :provisioning_path
-            @machine.communicate.sudo("chown -R #{username} #{path}",
-              :error_check => false)
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-require 'vagrant-1cloud/helpers/client'
-
-module VagrantPlugins
-  module OneCloud
-    module Actions
-      class PowerOff
-        include Helpers::Client
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::onecloud::power_off')
-        end
-
-        def call(env)
-          # submit power off droplet request
-          result = @client.post("/server/#{@machine.id}/action", {
-            :Type => 'PowerOff'
-          })
-
-          # wait for request to complete
-          env[:ui].info I18n.t('vagrant_1cloud.info.powering_off')
-          @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-          # refresh droplet state with provider
-          Provider.droplet(@machine, :refresh => true)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,45 +0,0 @@
-require 'vagrant-1cloud/helpers/client'
-
-module VagrantPlugins
-  module OneCloud
-    module Actions
-      class PowerOn
-        include Helpers::Client
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::onecloud::power_on')
-        end
-
-        def call(env)
-          # submit power on droplet request
-          result = @client.post("/server/#{@machine.id}/action", {
-            :Type => 'PowerOn'
-          })
-
-          # wait for request to complete
-          env[:ui].info I18n.t('vagrant_1cloud.info.powering_on')
-          @client.wait_for_event(env, @machine.id, result['body']['ID'])
-
-          # refresh droplet state with provider
-          Provider.droplet(@machine, :refresh => true)
-
-          user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root'
-
-          # wait for ssh to be ready
-          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
-          @client.wait_for_ssh(env, 3, 30)
-
-          @machine.config.ssh.username = user
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-

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

@@ -1,108 +0,0 @@
-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
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::onecloud::private_network')
-        end
-
-        def call(env)
-          # check if network name is set
-          return @app.call(env) unless @machine.provider_config.private_net
-
-          @machine.provider_config.private_net.each do |net, ip|
-            # Getting private network by name
-            result = @client.request('/network')
-            private_network = result['body'].find { |network| network['Name'] == net.to_s }
-
-            raise "Private network #{net} is not created" if !private_network
-
-            # Checking if machine is already added to network
-            result = @client.request("/server/#{@machine.id}")
-            linked_network = result['body']['LinkedNetworks'].find { |network| network['NetworkID'] == private_network['ID'] }
-
-            if linked_network
-                env[:ui].info I18n.t('vagrant_1cloud.info.already_connected', network: net)
-                next
-            end
-
-            # 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 !ip
-              ip = linked_network['IP']
-            end
-
-            # override ssh username to root temporarily
-            user = @machine.config.ssh.username
-            @machine.config.ssh.username = 'root'
-
-            # 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
-                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
-            end
-
-            # reset username
-            @machine.config.ssh.username = user
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,78 +0,0 @@
-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

@@ -1,42 +0,0 @@
-require 'vagrant-1cloud/helpers/client'
-
-module VagrantPlugins
-  module OneCloud
-    module Actions
-      class Reload
-        include Helpers::Client
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @client = client
-          @logger = Log4r::Logger.new('vagrant::onecloud::reload')
-        end
-
-        def call(env)
-          # 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'])
-
-          user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root'
-
-          # wait for ssh to be ready
-          env[:ui].info I18n.t('vagrant_1cloud.info.ssh')
-          @client.wait_for_ssh(env, 3, 30)
-
-          @machine.config.ssh.username = user
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-

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

@@ -1,60 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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