Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ These settings are optional:
- `volume_id`, If you wish to clone your volume from an existing volume set this to the source volume's ID. They must be in the same Availability Domain.
- `nsg_ids`, The option to connect up to 5 Network Security Groups to compute instance.
- `custom_metadata`, Add metadata to the compute instance request
- `instance_options`, A hash of optional mutable instance options.
Initially, the only option [supported in the Ruby SDK](https://docs.oracle.com/en-us/iaas/tools/ruby/latest/OCI/Core/Models/InstanceOptions.html)
is `are_legacy_imds_endpoints_disabled`.
Customers who have [migrated to IMDSv2](https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/gettingmetadata.htm#upgrading-v2)
should set this to `true`
- `all_plugins_disabled`, Whether Oracle Cloud Agent can run all the available plugins (default: `false`)
- `management_disabled`, Whether Oracle Cloud Agent can run all the available management plugins (default: `false`)
- `monitoring_disabled`, Whether Oracle Cloud Agent can gather performance metrics and monitor the instance using the monitoring plugins (default: `false`)
Expand Down
1 change: 1 addition & 0 deletions lib/kitchen/driver/oci.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class Oci < Kitchen::Driver::Base
default_config :post_create_reboot, false

# compute only configs
default_config :instance_options, {}
default_config :capacity_reservation_id
default_config :setup_winrm, false
default_config :winrm_user, "opc"
Expand Down
7 changes: 7 additions & 0 deletions lib/kitchen/driver/oci/instance/compute.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ def instance_source_via_image
)
end

# Adds the instance options property to the launch details.
def instance_options
return if config[:instance_options].empty?

launch_details.instance_options = OCI::Core::Models::InstanceOptions.new(config[:instance_options])
end

# Adds the source_details property to the launch_details for an instance that is being created from a boot volume.
def instance_source_via_boot_volume
return unless config[:boot_volume_id]
Expand Down
2 changes: 1 addition & 1 deletion lib/kitchen/driver/oci_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ module Driver
# Version string for Oracle OCI Kitchen driver
#
# @author Stephen Pearson (<stephen.pearson@oracle.com>)
OCI_VERSION = "1.27.0"
OCI_VERSION = "1.28.0"
end
end