vagrant-subutai 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4105a1ad3b5e5d3f61465aa910e4e876297e5309
-  data.tar.gz: 4261d2ba9fe00f7e61e5edb060ebd5c561d18b2f
+  metadata.gz: 96dfff84ab3bb322ef149071dd0ff43fbf0b16a2
+  data.tar.gz: 6724ea41bcfb8f01916a5b7deb3b48c395e1bf0e
 SHA512:
-  metadata.gz: 04eb8cb919fac5be3a5e6dee6a31570a95b583d992a263133d00c84f831fd1d11b215669b22fce837e97a14ea5c1cad37bca92aa8147c6a81983fa1524666e13
-  data.tar.gz: ecc183b0935f57facd0131b9ebcc7465e28e52ed6646a8aee38190362ff63a28d50cdee25ffdbe01a39431a6f8c7f70d6ee662a59694984c534afa94a3264b93
+  metadata.gz: d1c7f508d9b766ec48507e53618f939170ee1f0723460807657bfdfbd52f339ffd76220de7449ca912dddf34e5601b82576ff905d54428392a5787124288d6f2
+  data.tar.gz: 78acf8c97c92e3dcb7c0446329ebbc6f37752eea8c5892f06dbc1f51cbd822155ede144ff36eacc24e1b7dad070786839681d1e786121fedc726f6c92540162a

data/CHANGELOG.md

@@ -4,4 +4,9 @@ FEATURES:
 
   - Blueprint provisioning in two modes bazaar and peer
   - Open command PeerOS in browser
-    
+    
+## 1.1.1 (March 15, 2018)
+
+BUG FIXES:
+
+  - Blueprint provisioning check for ready PeerOS 

data/build.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-rm vagrant-subutai-1.1.0.gem
+rm vagrant-subutai-1.1.1.gem
 gem build vagrant-subutai.gemspec
 
 gem uninstall vagrant-subutai
-gem install ./vagrant-subutai-1.1.0.gem
+gem install ./vagrant-subutai-1.1.1.gem
 
 vagrant plugin uninstall vagrant-subutai
-vagrant plugin install ./vagrant-subutai-1.1.0.gem
+vagrant plugin install ./vagrant-subutai-1.1.1.gem

data/lib/vagrant-subutai/command.rb

@@ -31,7 +31,7 @@ module VagrantSubutai
         when 'open'
           subutai_cli.open(check_subutai_console_url(subutai_cli))
         when 'blueprint'
-          subutai_cli.blueprint(check_subutai_console_url(subutai_cli))
+          subutai_cli.blueprint(check_subutai_console_url(subutai_cli), 1)
         when '-h'
           STDOUT.puts cli_info
         when '--help'
@@ -54,7 +54,7 @@ module VagrantSubutai
       ip = subutai_cli.info(Configs::VagrantCommand::ARG_IP_ADDR)
 
       if ip.nil?
-        STDOUT.puts 'We can\'t detect your Subutai Console ip address!'
+        STDOUT.puts 'We can\'t detect your PeerOS ip address!'
         exit
       end
       "https://#{ip}:#{Configs::SubutaiConsoleAPI::PORT}"

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

@@ -122,7 +122,10 @@ module VagrantSubutai
         LOG          = '/rest/v1/tracker/operations/ENVIRONMENT%20MANAGER/'.freeze
         RESOURCES    = '/rest/v1/peer/resources?sptoken='.freeze
         DOMAIN       = '/rest/ui/environments/'.freeze
+        READY        = '/rest/v1/peer/ready'.freeze
       end
+      LOGIN = '/login'.freeze
+      DEFAULT_PASSWORDS = 'secret'.freeze
     end
 
     module Gorjun
@@ -150,6 +153,7 @@ module VagrantSubutai
 
     module Blueprint
       FILE_NAME = 'Subutai.json'.freeze
+      ATTEMPT = 10.freeze
     end
 
     module EnvironmentState

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

@@ -82,6 +82,7 @@ module SubutaiConfig
     SUBUTAI_CPU: 2,                  # virtual CPU's assign to the vm
     SUBUTAI_NAME: 'My Peer',         # PeerOS name
     SUBUTAI_SCOPE: 'Public',         # PeerOS scope
+    SUBUTAI_USERNAME: 'admin',       # PeerOS default username
 
     # Configuration parameters below have not been implemented
     SUBUTAI_SNAP: nil,               # alternative snap to provision

data/lib/vagrant-subutai/provisioner.rb

@@ -45,12 +45,12 @@ module VagrantSubutai
         ip = subutai_cli.info(Configs::VagrantCommand::ARG_IP_ADDR)
 
         if ip.nil?
-          STDOUT.puts 'We can\'t detect your Subutai Console ip address!'
+          STDOUT.puts 'We can\'t detect your PeerOS ip address!'
           exit
         end
         url = "https://#{ip}:#{Configs::SubutaiConsoleAPI::PORT}"
 
-        subutai_cli.blueprint(url)
+        subutai_cli.blueprint(url, 1)
       end
     end
 

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

@@ -23,6 +23,20 @@ module VagrantSubutai
         https.request(request)
       end
 
+      # Change password
+      def self.password(url, username, password, new_password)
+        uri = URI.parse(url + Configs::SubutaiConsoleAPI::LOGIN)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 3600 # an hour
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request.set_form_data('username' => username, 'password' => password, 'newpassword' => new_password)
+
+        https.request(request)
+      end
+
       # Subutai Hub credentials email, password
       # specify your peer_name
       # peer_scope acceptable only like this "Public" : "Private"
@@ -52,6 +66,18 @@ module VagrantSubutai
         https.request(request)
       end
 
+      def self.ready(url)
+        uri = URI.parse(url + Configs::SubutaiConsoleAPI::V1::READY)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 3600 # an hour
+
+        request = Net::HTTP::Get.new(uri.request_uri)
+
+        https.request(request)
+      end
+
       # Gets Finger print Subutai Console
       def self.fingerprint(url)
         uri = URI.parse(url + Configs::SubutaiConsoleAPI::V1::FINGERPRINT)

data/lib/vagrant-subutai/subutai_commands.rb

@@ -48,46 +48,60 @@ module VagrantSubutai
 
     # checks The Peer Os registered or not registered to Bazaar
     def registered?(url)
-      fingerprint = Rest::SubutaiConsole.fingerprint(url)
-      response = Rest::Bazaar.registered(fingerprint)
+      begin
+        fingerprint = Rest::SubutaiConsole.fingerprint(url)
+        response = Rest::Bazaar.registered(fingerprint)
 
-      case response
-        when Net::HTTPOK
-          return true
-        when Net::HTTPNotFound
-          return false
-        else
-          Put.error response.body
-          Put.error response.message
-          exit
+        case response
+          when Net::HTTPOK
+            return true
+          when Net::HTTPNotFound
+            return false
+          else
+            Put.error response.body
+            Put.error response.message
+            exit
+        end
+      rescue Net::OpenTimeout => e
+        Put.error e
       end
     end
 
     # register Subutai Peer Os to Bazaar by username and password
     def register(username, password, url)
       if registered?(url)
-        Put.warn "\nThe Peer Os already registered to Bazaar.\n"
+        Put.warn "\nThe PeerOs already registered to Bazaar.\n"
       else
-        username, password = get_input_token if username.nil? && password.nil?
-        response = Rest::SubutaiConsole.token(url, username, password)
+        begin
+          username, password = get_input_token if username.nil? || password.nil?
 
-        case response
-          when Net::HTTPOK
-            hub_email, hub_password, peer_name, peer_scope = get_input_register
-            peer_scope = peer_scope == 1 ? 'Public':'Private'
-            response = Rest::SubutaiConsole.register(response.body, url, hub_email, hub_password, peer_name, peer_scope)
-
-            case response
-              when Net::HTTPOK
-                Put.success response.body
-                Put.success "\"#{peer_name}\" successfully registered to Bazaar."
-              else
-                Put.error "Error: #{response.body}\n"
-                register(username, password, url)
-            end
-          else
-            Put.error "Error: #{response.body}\n"
-            register(nil, nil, url)
+          res = Rest::SubutaiConsole.password(url, username, Configs::SubutaiConsoleAPI::DEFAULT_PASSWORDS, password)
+
+          case res
+            when Net::HTTPOK
+              Put.info "\nSuccessfully changed default password.\n"
+          end
+
+          response = Rest::SubutaiConsole.token(url, username, password)
+
+          case response
+            when Net::HTTPOK
+              hub_email, hub_password, peer_name, peer_scope = get_input_register
+
+              response = Rest::SubutaiConsole.register(response.body, url, hub_email, hub_password, peer_name, peer_scope)
+
+              case response
+                when Net::HTTPOK
+                  Put.success response.body
+                  Put.success "\"#{peer_name}\" successfully registered to Bazaar."
+                else
+                  Put.error "Error: #{response.body}\n"
+              end
+            else
+              Put.error "Error: #{response.body}\n"
+          end
+        rescue Net::OpenTimeout => e
+          Put.error e
         end
       end
     end
@@ -104,14 +118,17 @@ module VagrantSubutai
           [hub_email, hub_password]
         else
           Put.error "Error: #{response.body}\n"
-          register_by_token(token, url)
       end
     end
 
     # Show Subutai Console finger print
     def fingerprint(url)
-      peer_id = Rest::SubutaiConsole.fingerprint(url)
-      Put.info peer_id
+      begin
+        peer_id = Rest::SubutaiConsole.fingerprint(url)
+        Put.info peer_id
+      rescue Net::OpenTimeout => e
+        Put.error e
+      end
     end
 
     # Get Subutai Peer Os credentials from input
@@ -121,7 +138,7 @@ module VagrantSubutai
 
       if SubutaiConfig.get(:SUBUTAI_USERNAME).nil?
         Put.warn "\nPlease enter credentials Subutai Peer Os:\n"
-        Put.info "\nusername: "
+        Put.info "\nPeerOS username: "
         username = STDIN.gets.chomp
       else
         username = SubutaiConfig.get(:SUBUTAI_USERNAME)
@@ -130,7 +147,7 @@ module VagrantSubutai
 
       if SubutaiConfig.get(:SUBUTAI_PASSWORD).nil?
         begin
-          Put.info "\npassword: "
+          Put.info "\nPeerOS password: "
           password = STDIN.noecho(&:gets).chomp
         rescue Errno::EBADF
           Put.warn "\nStdin doesn't support echo less input. Stdin can't hide password\n"
@@ -177,7 +194,7 @@ module VagrantSubutai
 
     # Get Bazaar credentials and peer info
     def get_input_register
-      Put.warn "\nRegister your peer to Bazaar:\n"
+      Put.warn "\nRegister your PeerOS to Bazaar:\n"
 
       hub_password = nil
       hub_email = nil
@@ -216,37 +233,77 @@ module VagrantSubutai
       ssh(base + "#{Configs::SubutaiAgentCommand::LIST} #{arg}")
     end
 
-    def blueprint(url)
-      variable = VagrantSubutai::Blueprint::VariablesController.new(0, 0, nil)
+    def blueprint(url, attempt)
+      begin
+        response = Rest::SubutaiConsole.ready(url)
 
-      resource = info('system')
-
-      if variable.validate && variable.check_quota?(resource)
-        mode = SubutaiConfig.get(:SUBUTAI_ENV_TYPE)
-
-        if mode.nil?
-          # check smart defaults
-          fingerprint = Rest::SubutaiConsole.fingerprint(url)
-          response = Rest::Bazaar.registered(fingerprint)
-
-          case response
-            when Net::HTTPOK
-              # [MODE] The blueprint provisioning via Bazaar
-              bazaar(url)
-            when Net::HTTPNotFound
-              # [MODE] blueprint provisioning via Peer Os (local)
-              peer(url, resource)
-            else
-              Put.error response.message
-              Put.error response.body
-          end
-        elsif mode == Configs::Blueprint::MODE::PEER
-          # [MODE] blueprint provisioning via Peer Os (local)
-          peer(url, resource)
-        elsif mode == Configs::Blueprint::MODE::BAZAAR
-          # [MODE] The blueprint provisioning via Bazaar
-          bazaar(url)
+        case response
+          when Net::HTTPOK                       # 200 Ready
+            # start provisioning
+            variable = VagrantSubutai::Blueprint::VariablesController.new(0, 0, nil)
+
+            resource = info('system')
+
+            if variable.validate && variable.check_quota?(resource)
+              mode = SubutaiConfig.get(:SUBUTAI_ENV_TYPE)
+
+              if mode.nil?
+                # check smart defaults
+                fingerprint = Rest::SubutaiConsole.fingerprint(url)
+                response = Rest::Bazaar.registered(fingerprint)
+
+                case response
+                  when Net::HTTPOK
+                    # [MODE] The blueprint provisioning via Bazaar
+                    bazaar(url)
+                  when Net::HTTPNotFound
+                    # [MODE] blueprint provisioning via Peer Os (local)
+                    peer(url, resource)
+                  else
+                    Put.error response.message
+                    Put.error response.body
+                end
+              elsif mode == Configs::Blueprint::MODE::PEER
+                # [MODE] blueprint provisioning via Peer Os (local)
+                peer(url, resource)
+              elsif mode == Configs::Blueprint::MODE::BAZAAR
+                # [MODE] The blueprint provisioning via Bazaar
+                bazaar(url)
+              end
+            end
+          when response.code == 503
+            if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+              sleep(2**attempt) #
+              blueprint(url, attempt+1)
+            end
+          when Net::HTTPNotFound
+            if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+              sleep(2**attempt) #
+              blueprint(url, attempt+1)
+            end
+          when response.code == 500       # management happened something wrong
+            Put.error "PeerOS failed to run!"
+          else
+            # PeerOs not ready
+            Put.error "PeerOS failed to run"
+        end
+      rescue Net::OpenTimeout => timeout
+        if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          sleep(2**attempt) #
+          blueprint(url, attempt+1)
         end
+      rescue Errno::ECONNRESET
+        if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          sleep(2**attempt) #
+          blueprint(url, attempt+1)
+        end
+      rescue OpenSSL::OpenSSLError # generic openssl error
+        if attempt < VagrantSubutai::Configs::Blueprint::ATTEMPT
+          sleep(2**attempt) #
+          blueprint(url, attempt+1)
+        end
+      rescue => e
+        Put.error e
       end
     end
 
@@ -258,7 +315,15 @@ module VagrantSubutai
       username = SubutaiConfig.get(:SUBUTAI_USERNAME)
       password = SubutaiConfig.get(:SUBUTAI_PASSWORD)
 
-      username, password = get_input_token if username.nil? && password.nil?
+      username, password = get_input_token if username.nil? || password.nil?
+
+      res = Rest::SubutaiConsole.password(url, username, Configs::SubutaiConsoleAPI::DEFAULT_PASSWORDS, password)
+
+      case res
+        when Net::HTTPOK
+          Put.info "\nSuccessfully changed default password.\n"
+      end
+
       response = Rest::SubutaiConsole.token(url, username, password)
 
       case response
@@ -270,8 +335,7 @@ module VagrantSubutai
           env.check_free_quota(resource)
           env.build(url, response.body, rh_id, peer_id, Configs::Blueprint::MODE::PEER)
         else
-          Put.error "Error: #{response.body}"
-          Put.warn "\n[WARNING] if you have a new PeerOS make sure you have to change the default UI console password. It’s default credentials are ‘admin’ / ‘secret’.\n"
+          Put.error "PeerOS: Error #{response.body}"
       end
     end
 
@@ -288,19 +352,28 @@ module VagrantSubutai
         username = SubutaiConfig.get(:SUBUTAI_USERNAME)
         pwd = SubutaiConfig.get(:SUBUTAI_PASSWORD)
 
-        username, pwd = get_input_token if username.nil? && pwd.nil?
+        username, pwd = get_input_token if username.nil? || pwd.nil?
+
+        res = Rest::SubutaiConsole.password(url, username, Configs::SubutaiConsoleAPI::DEFAULT_PASSWORDS, pwd)
+
+        case res
+          when Net::HTTPOK
+            Put.info "\nSuccessfully changed default password.\n"
+        end
+
         response = Rest::SubutaiConsole.token(url, username, pwd)
 
         case response
           when Net::HTTPOK
             email, password = register_by_token(response.body, url)
           else
-            Put.error response.body
+            Put.error "PeerOS: #{response.body}"
             Put.error response.message
+            return
         end
       end
 
-      email, password = get_input_login if email.nil? && password.nil?
+      email, password = get_input_login if email.nil? || password.nil?
 
       response = Rest::Bazaar.login(email, password)
 
@@ -319,7 +392,7 @@ module VagrantSubutai
           env = Blueprint::EnvironmentController.new
           env.build(url, cookies, rh_id, peer_id, Configs::Blueprint::MODE::BAZAAR)
         else
-          Put.error response.body
+          Put.error "Bazaar: #{response.body}"
       end
     end
 

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

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