Skip to content

Commit c965436

Browse files
xs2suruchixs2suruchi
authored
Merge pull request #126 from oracle-devrel/develop
Automation Toolkit Release v2024.4.1
2 parents 2577c6d + 00a6c37 commit c965436

File tree

179 files changed

+2681
-3488
lines changed

Some content is hidden

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

179 files changed

+2681
-3488
lines changed

‎Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN microdnf install -y sudo && \
1515
chown -R $USERNAME:$USERNAME /cd3user/tenancies/ && \
1616
microdnf install -y vim && \
1717
microdnf install -y dnf && \
18+
microdnf install -y graphviz && \
1819
echo 'alias vi="vim"' >> /etc/bashrc
1920

2021
USER $USERNAME

‎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

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Additionally, the toolkit also supports seamless resource management using OCI D
2121
🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code.
2222
<br>
2323

24-
[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/main.zip)
24+
[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip)
2525

2626
<br>
2727

‎cd3_automation_toolkit/Compute/export_instances_nonGreenField.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ def export_instances(inputfile, outdir, service_dir,config1, signer1, ct, export
371371

372372
tempStrKeys = "\n" + tempStrKeys
373373
tempStrKeys = "#START_instance_ssh_keys#" + tempStrKeys + "\t#instance_ssh_keys_END#"
374-
if ("\\n" in tempStrKeys):
375-
tempStrKeys = tempStrKeys.replace("\\n", "\\\\n")
374+
if ("\\" in tempStrKeys):
375+
tempStrKeys = tempStrKeys.replace("\\", "\\\\")
376376

377377
var_data[reg] = re.sub('#START_instance_ssh_keys#.*?#instance_ssh_keys_END#', tempStrKeys,
378378
var_data[reg],flags=re.DOTALL)

‎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: 12 additions & 4 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
@@ -90,10 +91,10 @@ instances = {
9091
{% if plugin_match %}
9192
plugins_details = {
9293
{% if plugin_bastion %}
93-
Bastion = "{{ plugin_bastion.upper() }}",
94+
Bastion = "{{ plugin_bastion.upper() }}"
9495
{% endif %}
9596
{% if plugin_management_agent %}
96-
"Management Agent" = "{{ plugin_management_agent.upper() }}",
97+
"Management Agent" = "{{ plugin_management_agent.upper() }}"
9798
{% endif %}
9899
{% if plugin_vulnerability_scanning %}
99100
"Vulnerability Scanning" = "{{ plugin_vulnerability_scanning.upper() }}"
@@ -125,6 +126,13 @@ instances = {
125126
{% if plugin_compute_hpc_rdma_auto_configuration %}
126127
"Compute HPC RDMA Auto-Configuration" = "{{ plugin_compute_hpc_rdma_auto_configuration.upper() }}"
127128
{% endif %}
129+
{% if plugin_os_management_hub_agent %}
130+
"OS Management Hub Agent" = "{{ plugin_os_management_hub_agent.upper() }}"
131+
{% endif %}
132+
{% if plugin_cloud_guard_workload_protection %}
133+
"Cloud Guard Workload Protection" = "{{ plugin_cloud_guard_workload_protection.upper() }}"
134+
{% endif %}
135+
128136
}
129137
{% endif %}
130138

‎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

‎cd3_automation_toolkit/Database/templates/dbsystems-vm-bm-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
# Database
67
# DBSystem-VM-BM - tfvars

‎cd3_automation_toolkit/Database/templates/exa-infra-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
# Database
67
# ExaInfra - tfvars

‎cd3_automation_toolkit/Database/templates/exa-vmclusters-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
# Database
67
# ExaVMClusters - tfvars

‎cd3_automation_toolkit/DeveloperServices/OKE/templates/cluster-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
# Developer Services
67
# OKE Cluster - tfvars

‎cd3_automation_toolkit/DeveloperServices/OKE/templates/nodepool-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
# Developer Services
67
# OKE Nodepool - tfvars

‎cd3_automation_toolkit/DeveloperServices/OKE/templates/virtual-nodepool-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
# Developer Services
67
# OKE Nodepool - tfvars

‎cd3_automation_toolkit/Excel_Columns

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"Description" : "description",
99
"Name" : "name"
1010
},
11+
"Users" :
12+
{
13+
"Family Name" : "family_name",
14+
"User Name" : "name"
15+
},
1116
"Policies" :
1217
{
1318
"Description" : "description",

‎cd3_automation_toolkit/Governance/Billing/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎cd3_automation_toolkit/Governance/Billing/create_terraform_budget.py

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)