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
8 changes: 7 additions & 1 deletion OCIWorkVMStack/scripts/installToolkit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ sudo mkdir -p /$mount_dir/tenancies
sudo mkdir -p /$mount_dir/oci_tools

tenancyconfig_properties="/$mount_dir/oci_tools/cd3_automation_toolkit/user-scripts/tenancyconfig.properties"
connectOCI_properties="/$mount_dir/oci_tools/cd3_automation_toolkit/connectOCI.properties"
start=$(date +%s.%N)
sudo sh -c "echo '########################################################################' >> /etc/motd"
sudo sh -c "echo ' Welcome to CD3 Automation Toolkit WorkVM' >> /etc/motd"
Expand Down Expand Up @@ -86,6 +87,11 @@ sudo sed -c -i "s/tenancy_ocid=.*/tenancy_ocid=$tenancy_id/" $tenancyconfig_prop
sudo sed -c -i "s/region=.*/region=$config_region/" $tenancyconfig_properties
sudo sed -c -i "s/user_ocid=.*/user_ocid=$user_id/" $tenancyconfig_properties

sudo sed -c -i "s/prefix=.*/prefix=$cust_name/" $connectOCI_properties
sudo sed -c -i "s/tenancy_ocid=.*/tenancy_ocid=$tenancy_id/" $connectOCI_properties
sudo sed -c -i "s/region=.*/region=$config_region/" $connectOCI_properties
sudo sed -c -i "s/user_ocid=.*/user_ocid=$user_id/" $connectOCI_properties

echo "***Building container image***" >> $logfile 2>&1
cd /tmp
cd githubCode
Expand All @@ -105,4 +111,4 @@ duration_sec=$(echo "$(date +%s.%N) - $start" | bc)
duration_min=$(echo "$duration_sec%3600/60" | bc)
execution_time=`printf "%.2f seconds" $duration_sec`
echo "Script Execution Time in Seconds: $execution_time" >> $logfile 2>&1
echo "Script Execution Time in Minutes: approx $duration_min Minutes" >> $logfile 2>&1
echo "Script Execution Time in Minutes: approx $duration_min Minutes" >> $logfile 2>&1
Binary file modified cd3_automation_toolkit/example/CD3-Azure-template.xlsx
Binary file not shown.
Binary file modified cd3_automation_toolkit/example/CD3-Blank-template.xlsx
Binary file not shown.
Binary file not shown.
Binary file modified cd3_automation_toolkit/example/CD3-CIS-template.xlsx
Binary file not shown.
Binary file modified cd3_automation_toolkit/example/CD3-Firewall-template.xlsx
Binary file not shown.
Binary file modified cd3_automation_toolkit/example/CD3-HubSpoke-template.xlsx
Binary file not shown.
Binary file modified cd3_automation_toolkit/example/CD3-SingleVCN-template.xlsx
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ def print_vcns(values_for_column_vcns, region, comp_name, vnc, vcn_info, drg_att
elif (col_header == "Compartment Name"):
values_for_column_vcns[col_header].append(comp_name)
elif (col_header == "Is Oracle GUA Allocation Enabled"):
print(vcn_info.ipv6_cidr_blocks)
if vcn_info.ipv6_cidr_blocks and len(vcn_info.ipv6_cidr_blocks) > 0:
values_for_column_vcns[col_header].append("True")
else:
Expand Down