Skip to content

Commit

Permalink
Merge pull request #53 from oracle-quickstart/issues-#51-and-#52
Browse files Browse the repository at this point in the history 
Fixed issues #51 & #52

Former-commit-id: 09ba77f
  • Loading branch information
@jpalmeiro
jpalmeiro authored Feb 20, 2024
2 parents 917144a + 7f5f957 commit b513007
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions orchestrator/networking.tf
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# ####################################################################################################### #
# Copyright (c) 2023 Oracle and/or its affiliates, All rights reserved. #
# Copyright (c) 2024 Oracle and/or its affiliates, All rights reserved. #
# Licensed under the Universal Permissive License v 1.0 as shown at https: //oss.oracle.com/licenses/upl. #
# Author: Cosmin Tudor #
# Author email: [email protected] #
# Last Modified: Tue Nov 21 2023 #
# Modified by: Cosmin Tudor, email: cosmin.tudor@oracle.com #
# Last Modified: Tue Feb 20 2024 #
# Modified by: Pablo Alonso, email: pablo.alonso@oracle.com #
# ####################################################################################################### #

locals {
Expand Down Expand Up @@ -242,6 +242,7 @@ locals {
network_security_groups = vcn_value.network_security_groups != null ? length(vcn_value.network_security_groups) > 0 ? {
for nsg_key, nsg_value in vcn_value.network_security_groups : nsg_key => {
compartment_id = nsg_value.compartment_id != null ? nsg_value.compartment_id : nsg_value.compartment_key != null ? local.compartments[nsg_value.compartment_key].id : null
display_name = nsg_value.display_name
defined_tags = nsg_value.defined_tags
freeform_tags = nsg_value.freeform_tags
ingress_rules = nsg_value.ingress_rules
Expand Down
5 changes: 3 additions & 2 deletions orchestrator/provider.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Licensed under the Universal Permissive License v 1.0 as shown at https: //oss.oracle.com/licenses/upl. #
# Author: Cosmin Tudor #
# Author email: [email protected] #
# Last Modified: Thu Nov 16 2023 #
# Modified by: Cosmin Tudor, email: cosmin.tudor@oracle.com #
# Last Modified: Tue Feb 20 2024 #
# Modified by: Pablo Alonso, email: pablo.alonso@oracle.com #
# ####################################################################################################### #

provider "oci" {
Expand All @@ -14,6 +14,7 @@ provider "oci" {
fingerprint = var.fingerprint
private_key_path = var.private_key_path
private_key_password = var.private_key_password
ignore_defined_tags = ["Oracle-Tags.CreatedBy", "Oracle-Tags.CreatedOn"]
}

terraform {
Expand Down

0 comments on commit b513007

Please sign in to comment.