morpheus-cli 3.6.22 → 3.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba216506570efee1b756a8b534dc529f006f9f8e939de8a1d4c4d549cd1a03c4
-  data.tar.gz: 127050886ebf02507861dfe55ca8e6c705e5404f15bc8c6c8cb25a17068f4589
+  metadata.gz: dcffe77543f6b4ac8d31742aacfa12c021c49fa79140ec9d21447b5a86a4ef21
+  data.tar.gz: db086e085556d680a02a862333e886e5dfc88c72066197325aca4f2f43fde60a
 SHA512:
-  metadata.gz: 9b9c74b514d944013b7bf7b5086115377ef071fa3b04b27ba6edef9da036d3917c6c69224b53466a755d9df8d91e8a9f063e4a66d252d82055719928831355c2
-  data.tar.gz: a8523b27b0db023e3321763718a817d386741164bd04ee88fe8cd4213afd672cbf81440b1915252005fa3e2aa156dbb81b9168e47d21fa96e7151db7c8325ccb
+  metadata.gz: a6ac7fcd0f8c88e28f51a2d19d9a3b4f20d8ecc2b4f70ccab4dfa4b4337aaa35e93f3a41fa067299fc47f65483edeb574ff08cf4b2af3f6b523fffedf15b7f0c
+  data.tar.gz: 33cb4330e4edcedbb950f057e9f25cf80c3b52cf592e12ee38e07ae2746b34a82dc8e389e7eb2a585913994c5b345a52fd1923308d2d6ff363232e63e7828bb9

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

@@ -284,6 +284,16 @@ module Morpheus::Cli::ProvisioningHelper
     # allow arbitrary -O values passed by the user
     if options[:options]
       arbitrary_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
+      # remove some things that are being prompted for
+      arbitrary_options.delete('group')
+      arbitrary_options.delete('cloud')
+      arbitrary_options.delete('type')
+      arbitrary_options.delete('name')
+      arbitrary_options.delete('layout')
+      arbitrary_options.delete('servicePlan')
+      arbitrary_options.delete('description')
+      arbitrary_options.delete('instanceContext')
+      arbitrary_options.delete('tags')
       payload.deep_merge!(arbitrary_options)
     end
 
@@ -347,9 +357,13 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
+    # plan_info has this property already..
+    # has_datastore = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasDatastore"]
+    # service_plan['hasDatastore'] = has_datastore
+
     # prompt for volumes
     # if payload['volumes'].nil?
-      volumes = prompt_volumes(service_plan, options, api_client, {})
+      volumes = prompt_volumes(service_plan, options, api_client, {zoneId: cloud_id, layoutId: layout_id, siteId: group_id})
       if !volumes.empty?
         payload['volumes'] = volumes
       end
@@ -466,6 +480,13 @@ module Morpheus::Cli::ProvisioningHelper
         end
       end
     end
+    # api does not always return datastores, so go get them if needed..
+    if plan_info['hasDatastore'] && datastore_options.empty?
+      option_results = options_interface.options_for_source('datastores', api_params)
+      option_results['data'].each do |it|
+          datastore_options << {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
+      end
+    end
 
     #puts "Configure Root Volume"
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.22"
+    VERSION = "3.6.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.22
+  version: 3.6.23
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler