morpheus-cli 3.6.22 → 3.6.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/morpheus/cli/mixins/provisioning_helper.rb +22 -1
- data/lib/morpheus/cli/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: dcffe77543f6b4ac8d31742aacfa12c021c49fa79140ec9d21447b5a86a4ef21
|
4
|
+
data.tar.gz: db086e085556d680a02a862333e886e5dfc88c72066197325aca4f2f43fde60a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a6ac7fcd0f8c88e28f51a2d19d9a3b4f20d8ecc2b4f70ccab4dfa4b4337aaa35e93f3a41fa067299fc47f65483edeb574ff08cf4b2af3f6b523fffedf15b7f0c
|
7
|
+
data.tar.gz: 33cb4330e4edcedbb950f057e9f25cf80c3b52cf592e12ee38e07ae2746b34a82dc8e389e7eb2a585913994c5b345a52fd1923308d2d6ff363232e63e7828bb9
|
@@ -284,6 +284,16 @@ module Morpheus::Cli::ProvisioningHelper
|
|
284
284
|
# allow arbitrary -O values passed by the user
|
285
285
|
if options[:options]
|
286
286
|
arbitrary_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
|
287
|
+
# remove some things that are being prompted for
|
288
|
+
arbitrary_options.delete('group')
|
289
|
+
arbitrary_options.delete('cloud')
|
290
|
+
arbitrary_options.delete('type')
|
291
|
+
arbitrary_options.delete('name')
|
292
|
+
arbitrary_options.delete('layout')
|
293
|
+
arbitrary_options.delete('servicePlan')
|
294
|
+
arbitrary_options.delete('description')
|
295
|
+
arbitrary_options.delete('instanceContext')
|
296
|
+
arbitrary_options.delete('tags')
|
287
297
|
payload.deep_merge!(arbitrary_options)
|
288
298
|
end
|
289
299
|
|
@@ -347,9 +357,13 @@ module Morpheus::Cli::ProvisioningHelper
|
|
347
357
|
end
|
348
358
|
end
|
349
359
|
|
360
|
+
# plan_info has this property already..
|
361
|
+
# has_datastore = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasDatastore"]
|
362
|
+
# service_plan['hasDatastore'] = has_datastore
|
363
|
+
|
350
364
|
# prompt for volumes
|
351
365
|
# if payload['volumes'].nil?
|
352
|
-
volumes = prompt_volumes(service_plan, options, api_client, {})
|
366
|
+
volumes = prompt_volumes(service_plan, options, api_client, {zoneId: cloud_id, layoutId: layout_id, siteId: group_id})
|
353
367
|
if !volumes.empty?
|
354
368
|
payload['volumes'] = volumes
|
355
369
|
end
|
@@ -466,6 +480,13 @@ module Morpheus::Cli::ProvisioningHelper
|
|
466
480
|
end
|
467
481
|
end
|
468
482
|
end
|
483
|
+
# api does not always return datastores, so go get them if needed..
|
484
|
+
if plan_info['hasDatastore'] && datastore_options.empty?
|
485
|
+
option_results = options_interface.options_for_source('datastores', api_params)
|
486
|
+
option_results['data'].each do |it|
|
487
|
+
datastore_options << {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
|
488
|
+
end
|
489
|
+
end
|
469
490
|
|
470
491
|
#puts "Configure Root Volume"
|
471
492
|
|
data/lib/morpheus/cli/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: morpheus-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.6.
|
4
|
+
version: 3.6.23
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Estes
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2019-03-
|
14
|
+
date: 2019-03-06 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: bundler
|