vagrant-subutai 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e85448afa09e694451410e4f71f30e8124723d48
-  data.tar.gz: 8417f914901d15c0652decffdacd9985b5670429
+  metadata.gz: d85530987aa29ed8ea34ba2f14f62b0f353610b7
+  data.tar.gz: e0052e2f1e16a49dacca29f63c93a257011a4bc4
 SHA512:
-  metadata.gz: 768dba9dc41d0d159c60365b5f94758ccc226a43de94d3d0f1a62b8d31165ca351fc4cc622ec20b0296440dca43dd97b9bca511a9f6615cc3d34a7c3b5dadf19
-  data.tar.gz: e781b7fb725b7747e37449dc0fea0363483278405b9cb3981d47815cbc1d1a950754e3f747c7d97937ca4023cc6fa034caad7c6294704ad31b3c6e25ef3079a6
+  metadata.gz: 6eb58cb2f067c894be6d8746bffcefd2c74ee8113587e39e0763be00db480e1cd9a5393c6fb86fb9d27f7178f62e8d6ad4fb724ea6f35921245a39577a023801
+  data.tar.gz: 84a85a6eddceed3ccb77df4577604e95159ff2504432b227eba8f7f39c0f72bfbeb527927e2932dc136c2d1c459469ab1e3ee2a537b5c946c77c2735116aaa63

data/CHANGELOG.md

@@ -15,4 +15,15 @@ BUG FIXES:
 
 BUG FIXES:
 
-  - [Windows] Blueprint provisioning run first vagrant up   
+  - [Windows] Blueprint provisioning run first vagrant up   
+
+## 1.1.3 (March 23, 2018)
+
+BUG FIXES:
+
+  - [Linux] arp command replaces with ip
+  - Long running ansible playbook error fixed
+
+FEATURES:
+
+  - VM Disk Path variable added to conf file (SUBUTAI_DISK_PATH)

data/lib/vagrant-subutai/blueprint/ansible_controller.rb

@@ -31,10 +31,17 @@ module VagrantSubutai
             Put.info "Adding hosts #{container.containerName} to group [#{group['name']}]"
 
             if group.key?('python-interpreter')
-              response = Rest::SubutaiConsole.command("echo \"#{container.containerName} ansible_user=root template=#{hostname} ansible_ssh_host=#{container.ip} ansible_python_interpreter=#{group['python-interpreter']}\" >> /etc/ansible/hosts", @environment.ansible_host_id, "/root","360000", @url, @token)
+              response = Rest::SubutaiConsole.command("echo \"#{container.containerName} ansible_user=root template=#{hostname} ansible_ssh_host=#{container.ip} ansible_python_interpreter=#{group['python-interpreter']}\" >> /etc/ansible/hosts",
+                                                      @environment.ansible_host_id,
+                                                      "/root",
+                                                      "360000",
+                                                      @url, @token)
               status(response)
             else
-              response = Rest::SubutaiConsole.command("echo \"#{container.containerName} ansible_user=root template=#{hostname} ansible_ssh_host=#{container.ip}\" >> /etc/ansible/hosts", @environment.ansible_host_id, "/root","360000", @url, @token)
+              response = Rest::SubutaiConsole.command("echo \"#{container.containerName} ansible_user=root template=#{hostname} ansible_ssh_host=#{container.ip}\" >> /etc/ansible/hosts",
+                                                      @environment.ansible_host_id,
+                                                      "/root","360000",
+                                                      @url, @token)
               status(response)
             end
           end
@@ -44,25 +51,117 @@ module VagrantSubutai
       # Downloads ansible source
       def download
         Put.info "\nStarted downloading ansible source...."
-        #response = Rest::SubutaiConsole.command("ansible-playbook download.json -e 'ansible_python_interpreter=/usr/bin/python3' --extra-vars '{ \"source_url\": \"#{@ansible.source_url}\"}'", @environment.ansible_host_id, "/root","360000", @url, @token)
-        response = Rest::SubutaiConsole.command("bash /root/get_unzip.sh #{@ansible.source_url}", @environment.ansible_host_id, "/root","360000", @url, @token)
+        response = Rest::SubutaiConsole.command_async("bash /root/get_unzip.sh #{@ansible.source_url}",
+                                                      @environment.ansible_host_id,
+                                                      "/root","360000",
+                                                      @url, @token)
 
-        status(response)
+        case response
+          when Net::HTTPOK
+            json = JSON.parse(response.body)
+            track(json['id'])
+          when Net::HTTPAccepted
+            json = JSON.parse(response.body)
+            track(json['id'])
+          else
+            Put.error response.body
+            Put.error response.message
+        end
+      end
+
+      # polls command log
+      #
+      # {
+      #    "exitCode": 127,
+      #    "stdOut": "",
+      #    "stdErr": "bash: /root/get_unzip.sh: No such file or directory\n",
+      #    "status": "FAILED"
+      # }
+      #
+      def track(command_id)
+        response = Rest::SubutaiConsole.command_log(@url, @token, command_id)
+
+        case response
+          when Net::HTTPOK
+            @log = JSON.parse response.body
+            @tmp = nil
+
+            until @log['status'] == Configs::CommandState::FAILED    ||
+                  @log['status'] == Configs::CommandState::KILLED    ||
+                  @log['status'] == Configs::CommandState::TIMEOUT   ||
+                  @log['status'] == Configs::CommandState::SUCCEEDED
+
+              res = Rest::SubutaiConsole.command_log(@url, @token, command_id)
+
+              begin
+                @log = JSON.parse res.body
+
+                if @tmp.nil?
+                  Put.info @log['stdOut']
+                else
+                  msg = @log['stdOut']
+
+                  if @tmp.length < msg.length
+                    msg = msg[(@tmp.length)..(msg.length-1)]
+                    Put.info msg
+                  end
+                end
+
+                @tmp = @log['stdOut']
+              rescue JSON::ParserError => e
+                Put.error e
+              end
+
+              sleep 5 # sleep 5 seconds
+            end
+
+            if @log['status'] == Configs::CommandState::SUCCEEDED
+              Put.success @log['status']
+            else
+              Put.error @log['status']
+              Put.error @log['stdErr']
+            end
+          else
+            Put.error response.body
+            Put.error response.message
+        end
       end
 
       # Runs ansible playbook
       def run
         Put.info "\nStarted running ansible playbook may be take too long time please wait......."
         if @ansible.extra_vars.empty?
-          response = Rest::SubutaiConsole.command("cd /root/*master/;ansible-playbook #{@ansible.ansible_playbook}", @environment.ansible_host_id, "/root","360000", @url, @token)
-          status(response)
+          response = Rest::SubutaiConsole.command_async("cd /root/*master/;ansible-playbook #{@ansible.ansible_playbook}", @environment.ansible_host_id, "/root","360000", @url, @token)
+
+          case response
+            when Net::HTTPOK
+              json = JSON.parse(response.body)
+              track(json['id'])
+            when Net::HTTPAccepted
+              json = JSON.parse(response.body)
+              track(json['id'])
+            else
+              Put.error response.body
+              Put.error response.message
+          end
         else
           extra_vars = {}
           @ansible.extra_vars.each do |extra_var|
             extra_var.map {|k, v| extra_vars[k] = v }
           end
-          response = Rest::SubutaiConsole.command("cd /root/*master;ansible-playbook #{@ansible.ansible_playbook} --extra-vars '#{extra_vars.to_json}'", @environment.ansible_host_id, "/root","360000", @url, @token)
-          status(response)
+          response = Rest::SubutaiConsole.command_async("cd /root/*master;ansible-playbook #{@ansible.ansible_playbook} --extra-vars '#{extra_vars.to_json}'", @environment.ansible_host_id, "/root","360000", @url, @token)
+
+          case response
+            when Net::HTTPOK
+              json = JSON.parse(response.body)
+              track(json['id'])
+            when Net::HTTPAccepted
+              json = JSON.parse(response.body)
+              track(json['id'])
+            else
+              Put.error response.body
+              Put.error response.message
+          end
         end
       end
 

data/lib/vagrant-subutai/blueprint/variables_controller.rb

@@ -323,7 +323,10 @@ module VagrantSubutai
 
           temp = nil
           validations.each_with_index do |validation, index|
-            if @available_ram >= Configs::Quota::RESOURCE[validation.strip.to_sym][:RAM] && @available_disk >= Configs::Quota::RESOURCE[validation.strip.to_sym][:DISK]
+            if Configs::Blueprint::CONTAINER_SIZES.include?(validation) && @available_ram >= Configs::Quota::RESOURCE[validation.strip.to_sym][:RAM] && @available_disk >= Configs::Quota::RESOURCE[validation.strip.to_sym][:DISK]
+              Put.info "    #{index}. #{validation}"
+              temp = index
+            else
               Put.info "    #{index}. #{validation}"
               temp = index
             end

data/lib/vagrant-subutai/command.rb

@@ -32,6 +32,8 @@ module VagrantSubutai
           subutai_cli.open(check_subutai_console_url(subutai_cli))
         when 'blueprint'
           subutai_cli.blueprint(check_subutai_console_url(subutai_cli), 1)
+        when 'finger'
+          subutai_cli.finger(check_subutai_console_url(subutai_cli))
         when '-h'
           STDOUT.puts cli_info
         when '--help'

data/lib/vagrant-subutai/configs/configs.rb

@@ -109,6 +109,8 @@ module VagrantSubutai
     module SubutaiConsoleAPI
       PORT    = '8443'.freeze
       COMMAND = '/rest/ui/commands?sptoken='.freeze
+      COMMAND_ASYNC = '/rest/ui/commands/async?sptoken='.freeze
+      COMMAND_LOG   = '/rest/ui/commands/async/{COMMAND_ID}?sptoken='.freeze
 
       module V1
         TOKEN        = '/rest/v1/identity/gettoken'.freeze
@@ -163,6 +165,13 @@ module VagrantSubutai
       UNHEALTHY = 'UNHEALTHY'.freeze
     end
 
+    module CommandState
+      SUCCEEDED = 'SUCCEEDED'.freeze
+      FAILED  = 'FAILED'.freeze
+      KILLED  = 'KILLED'.freeze
+      TIMEOUT = 'TIMEOUT'.freeze
+    end
+
     module ApplicationState
       INSTALLING = 'INSTALLING'.freeze
       INSTALLED  = 'INSTALLED'.freeze

data/lib/vagrant-subutai/packer/subutai_config.rb

@@ -43,6 +43,7 @@ module SubutaiConfig
     USER_VARIABLES
     BAZAAR_EMAIL
     BAZAAR_PASSWORD
+    SUBUTAI_DISK_PATH
   ].freeze
   
   GENERATED_PARAMETERS = %i[
@@ -257,6 +258,14 @@ module SubutaiConfig
       if key.to_sym == :SUBUTAI_ENV
         set_env(key.to_sym, temp[key].to_sym)
       elsif !temp[key].nil?
+        # TODO add double checks type
+
+        if temp[key] == 'true'
+          temp[key] = true
+        elsif temp[key] == 'false'
+          temp[key] = false
+        end
+
         @config.store(key.to_sym, temp[key])
       end
     end

data/lib/vagrant-subutai/packer/subutai_disk.rb

@@ -50,6 +50,23 @@ module SubutaiDisk
   def self.file(grow_by)
     disk_port = port
 
-    "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
+    # get disk path from conf file
+    if SubutaiConfig.get(:SUBUTAI_DISK_PATH).nil?
+      "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
+    else
+      # Check is directory exist
+      if File.directory?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
+        # check permission
+        if File.writable?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
+          File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}")
+        else
+          Put.warn "No write permission: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
+          "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
+        end
+      else
+        Put.warn "Invalid path: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
+        "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
+      end
+    end
   end
 end

data/lib/vagrant-subutai/packer/subutai_net.rb

@@ -72,18 +72,33 @@ end
 def arp_table
   broadcast_ping(2)
   arp_table = {}
-  `arp -a`.split("\n").each do |line|
-    matches = /.*(\d+\.\d+\.\d+.\d+)[[:space:]]((([a-f]|[0-9]){1,2}:){5}([a-f]|[0-9]){1,2})[[:space:]].*/.match(line) \
+
+  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin|darwin/
+    `arp -a`.split("\n").each do |line|
+      matches = /.*(\d+\.\d+\.\d+.\d+)[[:space:]]((([a-f]|[0-9]){1,2}:){5}([a-f]|[0-9]){1,2})[[:space:]].*/.match(line) \
       if (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-    matches = /.*\((\d+\.\d+\.\d+.\d+)\) at ((([a-f]|[0-9]){1,2}:){5}([a-f]|[0-9]){1,2}) .*/.match(line) \
-      if (RbConfig::CONFIG['host_os'] =~ /darwin|linux/)
+      matches = /.*\((\d+\.\d+\.\d+.\d+)\) at ((([a-f]|[0-9]){1,2}:){5}([a-f]|[0-9]){1,2}) .*/.match(line) \
+      if (RbConfig::CONFIG['host_os'] =~ /darwin/)
 
-    if ! matches.nil? && ! matches[2].nil?
-      key_mac = zero_pad_mac(matches[2])
-      value_ip = matches[1]
-      arp_table.store(key_mac, value_ip)
+      if ! matches.nil? && ! matches[2].nil?
+        key_mac = zero_pad_mac(matches[2])
+        value_ip = matches[1]
+        arp_table.store(key_mac, value_ip)
+      end
+    end
+  elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+    `ip n | awk '{print $1,$5}'`.split("\n").each do |line|
+      ip, mac = line.split(' ')
+
+      if ! line.nil? && ! mac.nil?
+
+        key_mac = zero_pad_mac(mac)
+        value_ip = ip
+        arp_table.store(key_mac, value_ip)
+      end
     end
   end
+
   arp_table
 end
 

data/lib/vagrant-subutai/rest/subutai_console.rb

@@ -157,7 +157,7 @@ module VagrantSubutai
 
       # Sends command to Subutai Console
       # method POST
-      def self.command(cmd, hostId, path, timeOut, url, token)
+      def self.command(cmd, hostid, path, timeout, url, token)
         uri = URI.parse(url + Configs::SubutaiConsoleAPI::COMMAND + token)
         https = Net::HTTP.new(uri.host, uri.port)
         https.use_ssl = true
@@ -165,7 +165,34 @@ module VagrantSubutai
         https.read_timeout = 21600 # 6 hours
 
         request = Net::HTTP::Post.new(uri.request_uri)
-        request.set_form_data({'command' => cmd, 'hostId' => hostId, 'path' => path, 'timeOut' => timeOut})
+        request.set_form_data({'command' => cmd, 'hostid' => hostid, 'path' => path, 'timeout' => timeout})
+
+        https.request(request)
+      end
+
+      # Sends  async request to Subutai Console
+      # method POST
+      def self.command_async(cmd, hostid, path, timeout, url, token)
+        uri = URI.parse(url + Configs::SubutaiConsoleAPI::COMMAND_ASYNC + token)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 21600 # 6 hours
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request.set_form_data({'command' => cmd, 'hostid' => hostid, 'path' => path, 'timeout' => timeout})
+
+        https.request(request)
+      end
+
+      def self.command_log(url, token, command_id)
+        uri = URI.parse(url + Configs::SubutaiConsoleAPI::COMMAND_LOG.gsub('{COMMAND_ID}', command_id) + token)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 21600 # 6 hours
+
+        request = Net::HTTP::Get.new(uri.request_uri)
 
         https.request(request)
       end

data/lib/vagrant-subutai/subutai_commands.rb

@@ -131,6 +131,20 @@ module VagrantSubutai
       end
     end
 
+    def finger(url)
+      begin
+        peer_id = Rest::SubutaiConsole.fingerprint(url)
+        ip = info('ipaddr')
+
+        Put.info ip
+        Put.info peer_id
+      rescue Net::OpenTimeout => e
+        Put.error e
+      rescue => e
+        Put.error e
+      end
+    end
+
     # Get Subutai Peer Os credentials from input
     def get_input_token
       password = nil
@@ -239,6 +253,7 @@ module VagrantSubutai
 
         case response
           when Net::HTTPOK                       # 200 Ready
+            #Put.info "http::ok #{attempt}"
             # start provisioning
             variable = VagrantSubutai::Blueprint::VariablesController.new(0, 0, nil)
 
@@ -273,11 +288,13 @@ module VagrantSubutai
             end
           when response.code == 503
             if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+              #Put.info "status code 503 attempt: #{attempt}"
               sleep(2**attempt) #
               blueprint(url, attempt+1)
             end
           when Net::HTTPNotFound
             if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+              #Put.info "net::httpnotfound attempt: #{attempt}"
               sleep(2**attempt) #
               blueprint(url, attempt+1)
             end
@@ -287,33 +304,39 @@ module VagrantSubutai
             # PeerOs not ready
             Put.error "PeerOS failed to run"
         end
-      rescue Net::OpenTimeout => timeout
+      rescue Net::OpenTimeout
         if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
-          sleep(2**attempt) #
+          #Put.info "net::opentimeout attempt: #{attempt}"
+          sleep(2**attempt) 
           blueprint(url, attempt+1)
         end
       rescue Errno::ECONNRESET
         if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          #Put.info "errno::econnreset attempt: #{attempt}"
           sleep(2**attempt) #
           blueprint(url, attempt+1)
         end
       rescue Errno::ECONNABORTED
         if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          #Put.info "errno::econnaborted attempt: #{attempt}"
           sleep(2**attempt) #
           blueprint(url, attempt+1)
         end
       rescue OpenSSL::OpenSSLError # generic openssl error
         if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          #Put.info "openssl::opensslerror attempt: #{attempt}"
           sleep(2**attempt) #
           blueprint(url, attempt+1)
         end
       rescue OpenSSL::SSL::SSLError
         if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          #Put.info "openssl::ssl::sslerror attempt: #{attempt}"
           sleep(2**attempt) #
           blueprint(url, attempt+1)
         end
       rescue => e
-        if attempt == 1 # fails first attempt then try
+        if attempt == 1 && ARGV[0] == 'up' # fails first attempt then try
+          #Put.info "e attempt: #{attempt} error: #{e} arg: #{ARGV[0]}"
           sleep(10)
           blueprint(url, attempt+1)
         else

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-subutai
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Subutai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler