morpheus-cli 2.11.3.1 → 2.11.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 836015cb51a22a6a3da1217038e96675f6876044
-  data.tar.gz: b33d6a043d810fcd2a3bfaefaaf671eeee21cf96
+  metadata.gz: 6e3f427d3041554bf62a805b36b293a058b8a89b
+  data.tar.gz: 4a1c1fb29ebd0f247751cf8d8a92c338c917353b
 SHA512:
-  metadata.gz: 2b9343e8835af95275215825186ad1162ffcb83288a39df86f5bdf5a21b145e4ba018f69d194b389f9a983d592e7ee5854b00ff93b3fd9c50f8d8666682c13c7
-  data.tar.gz: d8b85d7f7daece9b2e113bdf7fcad9cfeaaf0541a5a64e39cf3950a2ff503e47bfc1147be7dbad53154c5b486217d6c0792b276006a5795febb59d49d997fd50
+  metadata.gz: db2d64120026284e5cc0540aaa82481da3065de12052dd9a82e578af45957bd3987c2bb8afd91e191ed9e771a5f2b4d19c91351b8bd5e130738865aeaeb095fa
+  data.tar.gz: f62bb9929eff3405742a500af3270d24f8a315d66136ccf8cf736f6f349a34334d86b436b1cc545cb378e770e69fe241c8befb5cdf774d55b9fc431b73a82506

data/lib/morpheus/cli/clouds.rb

@@ -633,6 +633,8 @@ class Morpheus::Cli::Clouds
       out << "#{white}UNKNOWN#{return_color}"
     elsif status_string == 'ok'
       out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'syncing'
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
     else
       out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{cloud['statusMessage'] ? "#{return_color} - #{cloud['statusMessage']}" : ''}#{return_color}"
     end

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -878,16 +878,22 @@ module Morpheus::Cli::ProvisioningHelper
       end
 
       # choose IP unless network has a pool configured
+      ip_required = true
       if selected_network['id'].to_s.include?('networkGroup')
-        puts "IP Address: Using network group." if !no_prompt
+        #puts "IP Address: Using network group." if !no_prompt
+        ip_required = false
       elsif selected_network['pool']
-        puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
+        #puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
+        ip_required = false
       elsif selected_network['dhcpServer']
-        puts "IP Address: Using DHCP" if !no_prompt
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => true, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
+        #puts "IP Address: Using DHCP" if !no_prompt
+        ip_required = false
+      end
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => ip_required, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
+      if v_prompt[field_context] && !v_prompt[field_context]['ipAddress'].to_s.empty?
         network_interface['ipAddress'] = v_prompt[field_context]['ipAddress']
       end
+
       network_interfaces << network_interface
       interface_index += 1
       has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]

data/lib/morpheus/cli/remote.rb

@@ -683,6 +683,10 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:options, :json, :dry_run])
+      opts.on('-I','--insecure', "Allow insecure HTTPS communication.  i.e. bad SSL certificate.") do |val|
+        options[:insecure] = true
+        Morpheus::RestClient.enable_ssl_verification = false
+      end
       opts.footer = "This can be used to initialize a new appliance.\n" + 
                     "You will be prompted to create the master account.\n" + 
                     "This is only available on a new, freshly installed, remote appliance."

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.11.3.1"
+    VERSION = "2.11.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.3.1
+  version: 2.11.3.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler