Skip to content

Commit 4cee6ea

Browse files
committed
Automation Toolkit Release v2024.4.1
1 parent 3d1a6b7 commit 4cee6ea

File tree

589 files changed

+3418
-3421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

589 files changed

+3418
-3421
lines changed

OCIWorkVMStack/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ module "instance" {
3838
instance_shape = var.instance_shape
3939
instance_ram = var.instance_ram
4040
instance_ocpus = var.instance_ocpus
41+
boot_volume_size = var.boot_volume_size
4142
instance_ad = var.instance_ad
4243
instance_fd = var.instance_fd
4344
ssh_public_key = var.ssh_public_key

OCIWorkVMStack/modules/compute/instance.tf

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ resource "oci_core_instance" "instances" {
66
shape = var.instance_shape
77

88
shape_config {
9-
109
memory_in_gbs = var.instance_ram
1110
ocpus = var.instance_ocpus
1211
#baseline_ocpu_utilization = var.baseline_ocpu_utilization
1312
}
1413
source_details {
1514
source_id = var.instance_image_ocid
1615
source_type = "image"
17-
#boot_volume_size_in_gbs = var.boot_volume_size
16+
boot_volume_size_in_gbs = var.boot_volume_size
1817
}
1918
create_vnic_details {
2019
#assign_public_ip = local.PulicIP == true ? "false" : "true"
@@ -30,6 +29,20 @@ resource "oci_core_instance" "instances" {
3029
config_region = var.config_region
3130
user_data = fileexists("${path.root}/scripts/${var.cloud_init_script}") ? "${base64encode(file("${path.root}/scripts/${var.cloud_init_script}"))}" : null
3231
}
32+
instance_options {
33+
are_legacy_imds_endpoints_disabled = "true"
34+
}
35+
36+
is_pv_encryption_in_transit_enabled = "true"
37+
agent_config {
38+
are_all_plugins_disabled = "false"
39+
is_management_disabled = "false"
40+
is_monitoring_disabled = "false"
41+
plugins_config {
42+
desired_state = "ENABLED"
43+
name = "Bastion"
44+
}
45+
}
3346

3447
lifecycle {
3548
ignore_changes = []

OCIWorkVMStack/modules/compute/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ variable "instance_ocpus" {
5757
default = 1
5858
}
5959

60+
variable "boot_volume_size" {
61+
description = "Boot volume size"
62+
type = number
63+
default = 50
64+
}
65+
6066
variable "instance_ad" {
6167
description = "The Availability domain in which instance will be provisioned."
6268
type = string

OCIWorkVMStack/schema.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ variableGroups:
2929
- instance_shape
3030
- instance_ocpus
3131
- instance_ram
32+
- boot_volume_size
3233
- instance_ad
3334
- instance_fd
3435
- ssh_public_key
3536

37+
3638
- title : "Networking Details for CD3 Automation Toolkit WorkVM"
3739
variables:
3840
- vcn_strategy
@@ -165,7 +167,16 @@ variables:
165167
maximum: 1024
166168
multipleOf: 1
167169
required: true
168-
170+
boot_volume_size:
171+
visible:
172+
type: integer
173+
title: Boot volume size in GBs
174+
description: Boot volume size in GBs. Default is 50 GB and value should be multiple of 1.
175+
default: 50
176+
minimum: 50
177+
maximum: 32768
178+
multipleOf: 1
179+
required: true
169180
instance_ad:
170181
type: oci:identity:availabilitydomain:name
171182
title: Select Availability domain

OCIWorkVMStack/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ variable "instance_ocpus" {
9999
default = 1
100100
}
101101

102+
variable "boot_volume_size" {
103+
description = "Boot volume size"
104+
type = number
105+
default = 50
106+
}
107+
102108
variable "instance_ad" {
103109
description = "The Availability domain in which instance will be provisioned."
104110
type = string

cd3_automation_toolkit/Compute/templates/dedicatedvmhosts-template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% if count == 0 %}
2-
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3-
2+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
45
############################
56
# Dedicated VM Hosts
67
# Dedicated VM Hosts - tfvars

cd3_automation_toolkit/Compute/templates/instances-template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% if count == 0 %}
2-
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3-
2+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
45
############################
56
# Instances
67
# Instance - tfvars

cd3_automation_toolkit/CostManagement/Budget/templates/budget-alert-rule-template

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{% if count == 0 %}
2-
3-
// Copyright (c) 2024, Oracle and/or its affiliates.
4-
52
############################
63
# Governance
74
# Create Budget Alert Rules

cd3_automation_toolkit/CostManagement/Budget/templates/budget-template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% if count == 0 %}
2-
// Copyright (c) 2024, Oracle and/or its affiliates.
3-
2+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
45
############################
56
# Governance
67
# Create Budgets

cd3_automation_toolkit/Database/templates/adb-template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% if count == 0 %}
2-
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3-
2+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
#
45
############################
56
# ADB
67
# ADB - tfvars

0 commit comments

Comments
 (0)