diff --git a/OCIWorkVMStack/scripts/installToolkit.sh b/OCIWorkVMStack/scripts/installToolkit.sh index 01b10f0f0..5ecd7e385 100644 --- a/OCIWorkVMStack/scripts/installToolkit.sh +++ b/OCIWorkVMStack/scripts/installToolkit.sh @@ -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" @@ -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 @@ -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 \ No newline at end of file +echo "Script Execution Time in Minutes: approx $duration_min Minutes" >> $logfile 2>&1 diff --git a/cd3_automation_toolkit/example/CD3-Azure-template.xlsx b/cd3_automation_toolkit/example/CD3-Azure-template.xlsx index 5a1a761a5..7f53d56ef 100644 Binary files a/cd3_automation_toolkit/example/CD3-Azure-template.xlsx and b/cd3_automation_toolkit/example/CD3-Azure-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-Blank-template.xlsx b/cd3_automation_toolkit/example/CD3-Blank-template.xlsx index 31a1405fc..c6e2332fe 100644 Binary files a/cd3_automation_toolkit/example/CD3-Blank-template.xlsx and b/cd3_automation_toolkit/example/CD3-Blank-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-CIS-ManagementServices-template.xlsx b/cd3_automation_toolkit/example/CD3-CIS-ManagementServices-template.xlsx index f526717d6..6641401c4 100644 Binary files a/cd3_automation_toolkit/example/CD3-CIS-ManagementServices-template.xlsx and b/cd3_automation_toolkit/example/CD3-CIS-ManagementServices-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-CIS-template.xlsx b/cd3_automation_toolkit/example/CD3-CIS-template.xlsx index d211ab97e..71fc923e4 100644 Binary files a/cd3_automation_toolkit/example/CD3-CIS-template.xlsx and b/cd3_automation_toolkit/example/CD3-CIS-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-Firewall-template.xlsx b/cd3_automation_toolkit/example/CD3-Firewall-template.xlsx index 1f6c68a59..5d03186c5 100644 Binary files a/cd3_automation_toolkit/example/CD3-Firewall-template.xlsx and b/cd3_automation_toolkit/example/CD3-Firewall-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-HubSpoke-template.xlsx b/cd3_automation_toolkit/example/CD3-HubSpoke-template.xlsx index 92723d032..9e50f6c79 100644 Binary files a/cd3_automation_toolkit/example/CD3-HubSpoke-template.xlsx and b/cd3_automation_toolkit/example/CD3-HubSpoke-template.xlsx differ diff --git a/cd3_automation_toolkit/example/CD3-SingleVCN-template.xlsx b/cd3_automation_toolkit/example/CD3-SingleVCN-template.xlsx index 64946d17a..fde0c02b7 100644 Binary files a/cd3_automation_toolkit/example/CD3-SingleVCN-template.xlsx and b/cd3_automation_toolkit/example/CD3-SingleVCN-template.xlsx differ diff --git a/cd3_automation_toolkit/ocicloud/python/network/basenetwork/export_network_nonGreenField.py b/cd3_automation_toolkit/ocicloud/python/network/basenetwork/export_network_nonGreenField.py index 49b82754d..a412eb9ba 100644 --- a/cd3_automation_toolkit/ocicloud/python/network/basenetwork/export_network_nonGreenField.py +++ b/cd3_automation_toolkit/ocicloud/python/network/basenetwork/export_network_nonGreenField.py @@ -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: