morpheus-cli 5.4.2 → 5.4.4

data/lib/morpheus/cli/commands/clusters.rb

@@ -8,7 +8,7 @@ class Morpheus::Cli::Clusters
   include Morpheus::Cli::AccountsHelper
 
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}
-  register_subcommands :list_workers, :add_worker
+  register_subcommands :list_workers, :add_worker, :remove_worker, :update_worker_count
   register_subcommands :list_masters
   register_subcommands :list_volumes, :remove_volume
   register_subcommands :list_namespaces, :get_namespace, :add_namespace, :update_namespace, :remove_namespace
@@ -547,11 +547,7 @@ class Morpheus::Cli::Clusters
           available_layouts = layouts_for_dropdown(cloud['id'], cluster_type['id'])
 
           if !available_layouts.empty?
-            if available_layouts.count > 1 && !options[:no_prompt]
-              layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
-            else
-              layout_id = available_layouts.first['id']
-            end
+            layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
             layout = find_layout_by_name_or_id(layout_id)
           end
         end
@@ -560,17 +556,25 @@ class Morpheus::Cli::Clusters
 
         # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
+        provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
 
         api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
         # Controller type
-        server_types = @server_types_interface.list({max:1, computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes']
+        server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'}
         controller_provision_type = nil
         resource_pool = nil
 
         if !server_types.empty?
           controller_type = server_types.first
-          controller_provision_type = controller_type['provisionType'] ? (@provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil) : nil
+
+          if controller_type['provisionType']
+            if provision_type && provision_type['id'] == controller_type['provisionType']['id']
+              controller_provision_type = provision_type
+            else
+              controller_provision_type = @provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil
+            end
+          end
 
           if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
@@ -585,21 +589,23 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan(api_params, options)
 
         if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, provision_type, options)}
           api_params['planId'] = service_plan['id']
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
-
-        if !volumes.empty?
-          server_payload['volumes'] = volumes
+        if provision_type['hasVolumes']
+          volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
+          if !volumes.empty?
+            server_payload['volumes'] = volumes
+          end
         end
 
         # Options / Custom Config
         option_type_list =
-          ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
+          ((controller_type.nil? ? [] : controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) +
+          layout['optionTypes'] +
+          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue []))
 
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
@@ -625,11 +631,13 @@ class Morpheus::Cli::Clusters
         cluster_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(load_layout_options(cluster_payload), options[:options], @api_client, api_params, options[:no_prompt], true))
 
         # Server options
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params, options[:no_prompt], true))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        if !['manual', 'external'].include?(provision_type['code'])
+          default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+          server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        end
 
         # Create User
         if !options[:createUser].nil?
@@ -657,10 +665,12 @@ class Morpheus::Cli::Clusters
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Workflow / Automation
-        task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
+        if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
+          task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
 
-        if !task_set_id.nil?
-          server_payload['taskSet'] = {'id' => task_set_id}
+          if !task_set_id.nil?
+            server_payload['taskSet'] = {'id' => task_set_id}
+          end
         end
 
         cluster_payload['server'] = server_payload
@@ -1167,12 +1177,14 @@ class Morpheus::Cli::Clusters
         cloud = @clouds_interface.get(cloud_id)['zone']
         cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
         group = @groups_interface.get(cluster['site']['id'])['group']
-
+        provision_type = server_type['provisionType'] || {}
+        provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
+        
         server_payload['cloud'] = {'id' => cloud_id}
         service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
-          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, nil, options)}
         end
 
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
@@ -1180,7 +1192,7 @@ class Morpheus::Cli::Clusters
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, {zoneId: cloud['id'], siteId: group['id']})
+        volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options.merge({'defaultAddFirstDataVolume': true}), @api_client, {zoneId: cloud['id'], siteId: group['id']})
 
         if !volumes.empty?
           server_payload['volumes'] = volumes
@@ -1188,7 +1200,6 @@ class Morpheus::Cli::Clusters
 
         # Networks
         # NOTE: You must choose subnets in the same availability zone
-        provision_type = server_type['provisionType'] || {}
         if provision_type && cloud['zoneType']['code'] != 'esxi'
           server_payload['networkInterfaces'] = options[:networkInterfaces] || prompt_network_interfaces(cloud['id'], server_type['provisionType']['id'], (resource_pool['id'] rescue nil), options)
         end
@@ -1264,6 +1275,90 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def remove_worker(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster] [worker]")
+      opts.on( '-f', '--force', "Force Delete" ) do
+        params[:force] = 'on'
+        end
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete a worker from a cluster.\n" +
+                    "[cluster] is required. This is the name or id of an existing cluster.\n" +
+                    "[worker] is required. This is the name or (server) id of an existing worker."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    params.merge!(parse_query_options(options))
+
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    worker_id = args[1]
+    if worker_id.empty?
+      raise_command_error "missing required worker parameter"
+    end
+
+    worker = find_worker_by_name_or_id(cluster['id'], worker_id)
+    if worker.nil?
+      print_red_alert "Worker not found for '#{worker_id}'"
+      return 1
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the cluster worker '#{worker['name'] || worker['id']}'?", options)
+      return 9, "aborted command"
+    end
+
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.destroy_worker(cluster['id'], worker['id'], params)
+      return
+    end
+    json_response = @clusters_interface.destroy_worker(cluster['id'], worker['id'], params)
+    render_response(json_response, options) do
+      print_green_success "Worker #{worker['name']} is being removed from cluster #{cluster['name']}..." 
+    end
+    return 0, nil
+  end
+
+  def update_worker_count(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster] [worker_count]")
+      build_standard_update_options(opts, options)
+      opts.footer = "Resizes a cluster to the specified number of worker nodes.\n" +
+                    "[cluster] is required. This is the name or id of an existing cluster.\n" +
+                    "[worker_count] is required. This is the desired number of workers."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    worker_count = args[1]
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'workerCount' => worker_count.to_i})
+    else
+      payload.deep_merge!({'workerCount' => worker_count.to_i})
+    end
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.update_worker_count(cluster['id'], payload)
+      return
+    end
+    json_response = @clusters_interface.update_worker_count(cluster['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Cluster #{cluster['name']} is being resized to #{worker_count} worker nodes..." 
+    end
+    return 0, nil
+  end
+
   def list_masters(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -3469,6 +3564,35 @@ class Morpheus::Cli::Clusters
     out
   end
 
+  def find_worker_by_name_or_id(cluster_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      find_worker_by_id(cluster_id, val.to_i)
+    else
+      find_worker_by_name(cluster_id, val)
+    end
+   
+  end
+
+  def find_worker_by_id(cluster_id, id)
+    json_results = @clusters_interface.list_workers(cluster_id)
+    filtered_results = json_results['workers'].select {|worker| worker['id'] == id}
+    if filtered_results.empty? || filtered_results.count > 1
+      print_red_alert "Worker not found by id #{id}"
+      exit 1
+    end
+    filtered_results[0]
+  end
+
+  def find_worker_by_name(cluster_id, name)
+    params = {phrase: name}
+    json_results = @clusters_interface.list_workers(cluster_id, params)
+    if json_results['workers'].empty? || json_results['workers'].count > 1
+      print_red_alert "Worker not found by name #{name}"
+      exit 1
+    end
+    json_results['workers'][0]
+  end
+
   def find_cluster_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       find_cluster_by_id(val)
@@ -3713,34 +3837,37 @@ class Morpheus::Cli::Clusters
     service_plan
   end
 
-  def prompt_service_plan_options(service_plan, options)
+  def prompt_service_plan_options(service_plan, provision_type, options)
     plan_options = {}
-
-    # custom max memory
-    if service_plan['customMaxMemory']
-      if !options[:maxMemory]
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
-        plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
-      else
-        plan_options['maxMemory'] = options[:maxMemory]
+    hide_custom_options = provision_type && provision_type['code'] == 'manual'
+
+    if !hide_custom_options
+      # custom max memory
+      if service_plan['customMaxMemory']
+        if !options[:maxMemory]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
+          plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
+        else
+          plan_options['maxMemory'] = options[:maxMemory]
+        end
       end
-    end
 
-    # custom cores: max cpu, max cores, cores per socket
-    if service_plan['customCores']
-      if options[:cpuCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
-        plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
-      else
-        plan_options['cpuCount']
-      end
-      if options[:coreCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
-        plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
-      end
-      if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
-        plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+      # custom cores: max cpu, max cores, cores per socket
+      if service_plan['customCores']
+        if options[:cpuCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
+          plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
+        else
+          plan_options['cpuCount']
+        end
+        if options[:coreCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
+          plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
+        end
+        if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
+          plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+        end
       end
     end
     plan_options

data/lib/morpheus/cli/commands/credential_types_command.rb

@@ -0,0 +1,36 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::CredentialTypesCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_description "View credential types"
+  set_command_name :'credential-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :credential_types
+
+  protected
+
+  def credential_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+    }
+  end
+
+  def credential_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      # "Description" => 'description',
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Creatable" => lambda {|it| format_boolean(it['creatable']) },
+      "Editable" => lambda {|it| format_boolean(it['editable']) },
+    }
+  end
+
+end
+

data/lib/morpheus/cli/commands/credentials_command.rb

@@ -0,0 +1,124 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::CredentialsCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :'credentials'
+  set_command_description "View and manage credentials."
+  register_subcommands :list, :get, :add, :update, :remove
+
+  # RestCommand settings
+  register_interfaces :credentials, :credential_types
+  set_rest_has_type true
+  # set_rest_type :credential_types
+
+  protected
+
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(credential_column_definitions(options, record), record, options)
+      print reset,"\n"
+    end
+  end
+
+  def credential_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+    }
+  end
+
+  def credential_column_definitions(options, credential)
+    columns = [
+      {"ID" => 'id' },
+      {"Credential Store" => lambda {|it| it['integration'] ? it['integration']['name'] : 'Internal'} },
+      {"Name" => 'name' },
+      {"Description" => 'description' },
+      {"Type" => lambda {|it| it['type'] ? it['type']['name'] : '' } },
+      {"Enabled" => lambda {|it| format_boolean(it['enabled']) } },
+    ]
+    type_code = credential['type']['code']
+    if type_code == "access-key-secret"
+      columns += [
+        {"Access Key" => lambda {|it| it['username'] } },
+        {"Secret Key" => lambda {|it| it['password'] } },
+      ]
+    elsif type_code == "client-id-secret"
+      columns += [
+        {"Client ID" => lambda {|it| it['username'] } },
+        {"Client Secret" => lambda {|it| it['password'] } },
+      ]
+    elsif type_code == "email-private-key"
+      columns += [
+        {"Email" => lambda {|it| it['username'] } },
+        {"Private Key" => lambda {|it| it['authKey'] ? it['authKey']['name'] : '' } },
+      ]
+    elsif type_code == "tenant-username-keypair" || type_code == "tenant-username-key"
+      columns += [
+        {"Tenant" => lambda {|it| it['authPath'] } },
+        {"Username" => lambda {|it| it['username'] } },
+        {"Private Key" => lambda {|it| it['authKey'] ? it['authKey']['name'] : '' } },
+      ]
+    elsif type_code == "username-api-key"
+      columns += [
+        {"Username" => lambda {|it| it['username'] } },
+        {"API Key" => lambda {|it| it['password'] } },
+      ]
+    elsif type_code == "username-keypair" || type_code == "username-key"
+      columns += [
+        {"Username" => lambda {|it| it['username'] } },
+        {"Private Key" => lambda {|it| it['authKey'] ? it['authKey']['name'] : '' } },
+      ]
+    elsif type_code == "username-password"
+      columns += [
+        {"Username" => lambda {|it| it['username'] } },
+        {"Password" => lambda {|it| it['password'] } },
+      ]
+    elsif type_code == "username-password-keypair" || type_code == "username-password-key"
+      columns += [
+        {"Username" => lambda {|it| it['username'] } },
+        {"Password" => lambda {|it| it['password'] } },
+        {"Private Key" => lambda {|it| it['authKey'] ? it['authKey']['name'] : '' } },
+      ]
+    end
+    columns += [
+      {"Created" => lambda {|it| format_local_dt(it['dateCreated']) } },
+      {"Updated" => lambda {|it| format_local_dt(it['lastUpdated']) } },
+    ]
+    return columns
+  end
+
+  def add_credential_option_types()
+    [
+      {'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Credential Type', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
+        api_client.credential_types.list({max:10000})['credentialTypes'].collect { |it| {"name" => it["name"], "value" => it["code"]} }
+      }, 'required' => true},
+      {'fieldName' => 'integration.id', 'fieldLabel' => 'Credential Store', 'type' => 'select', 'optionSource' => 'credentialIntegrations'},
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true},
+    ]
+  end
+
+  def add_credential_advanced_option_types()
+    []
+  end
+
+  def update_credential_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text'},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox'},
+    ]
+  end
+
+  def update_credential_advanced_option_types()
+    add_credential_advanced_option_types()
+  end
+
+end

data/lib/morpheus/cli/commands/hosts.rb

@@ -29,6 +29,7 @@ class Morpheus::Cli::Hosts
     @task_sets_interface = @api_client.task_sets
     @servers_interface = @api_client.servers
     @server_types_interface = @api_client.server_types
+    @provision_types_interface = @api_client.provision_types
     @logs_interface = @api_client.logs
     @accounts_interface = @api_client.accounts
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
@@ -854,6 +855,19 @@ class Morpheus::Cli::Hosts
         # remove cpu and memory option types, which now come from the plan
         option_type_list = reject_service_plan_option_types(option_type_list)
 
+        # need to GET provision type for optionTypes, and other settings...
+        provision_type_code = server_type["provisionType"] ? server_type["provisionType"]["code"] : nil
+        provision_type = nil
+        if provision_type_code
+          provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+          if provision_type.nil?
+            print_red_alert "Provision Type not found by code #{provision_type_code}"
+            exit 1
+          end
+        else
+          provision_type = get_provision_type_for_zone_type(cloud['zoneType']['id'])
+        end
+
         # prompt for resource pool
         pool_id = nil
         has_zone_pools = server_type["provisionType"] && server_type["provisionType"]["hasZonePools"]
@@ -873,11 +887,17 @@ class Morpheus::Cli::Hosts
         end
 
         # prompt for volumes
-        volumes = prompt_volumes(service_plan, options, @api_client, {zoneId: cloud_id, serverTypeId: server_type['id'], siteId: group_id})
+        volumes = prompt_volumes(service_plan, provision_type, options, @api_client, {zoneId: cloud_id, serverTypeId: server_type['id'], siteId: group_id})
         if !volumes.empty?
           payload['volumes'] = volumes
         end
 
+        # plan customizations
+        plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
+        if plan_opts && !plan_opts.empty?
+          payload['servicePlanOptions'] = plan_opts
+        end
+
         # prompt for network interfaces (if supported)
         if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
           begin
@@ -1220,6 +1240,10 @@ class Morpheus::Cli::Hosts
         :server => {:id => server["id"]}
       }
 
+      # need to GET provision type for some settings...
+      server_type = @server_types_interface.get(server_type_id)['serverType']
+      provision_type = @provision_types_interface.get(server_type['provisionType']['id'])['provisionType']
+
       # avoid 500 error
       # payload[:servicePlanOptions] = {}
       unless options[:no_prompt]
@@ -1247,11 +1271,17 @@ class Morpheus::Cli::Hosts
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
       # prompt for volumes
-      volumes = prompt_resize_volumes(current_volumes, service_plan, options)
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, options)
       if !volumes.empty?
         payload[:volumes] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, server)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # todo: reconfigure networks
       #       need to get provision_type_id for network info
       # prompt for network interfaces (if supported)