Skip to content

Commit a0c5520

Browse files
craigcarl-oraclecraigcarl-oracle
committed
Improving examples
1 parent 2caa46b commit a0c5520

File tree

2 files changed

+42
-24
lines changed

2 files changed

+42
-24
lines changed

‎docs/examples/Gluster/gluster.tf‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ variable "VPC-CIDR" {
1717
}
1818

1919
variable "ADs" {
20-
default = ["Ucom:PHX-AD-1", "Ucom:PHX-AD-2", "Ucom:PHX-AD-3"]
20+
default = ["Uocm:PHX-AD-1", "Uocm:PHX-AD-2", "Uocm:PHX-AD-3"]
2121
}
2222

2323
resource "baremetal_core_virtual_network" "CompleteVCN" {
24-
cidr_block = "${var.VCP-CIDR}"
24+
cidr_block = "${var.VPC-CIDR}"
2525
compartment_id = "${var.compartment_ocid}"
2626
display_name = "CompleteVCN"
2727
}
@@ -40,6 +40,7 @@ resource "baremetal_core_route_table" "RouteForComplete" {
4040
cidr_block = "0.0.0.0/0"
4141
network_entity_id = "${baremetal_core_internet_gateway.CompleteIG.id}"
4242
}
43+
}
4344

4445
resource "baremetal_core_security_list" "WebSubnet" {
4546
compartment_id = "${var.compartment_ocid}"
@@ -64,12 +65,20 @@ resource "baremetal_core_security_list" "PrivateSubnet" {
6465
display_name = "Private"
6566
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
6667
egress_security_rules {
68+
tcp_options {
69+
"max" = 0
70+
"min" = 0
71+
}
72+
protocol = "6"
73+
destination = "${var.VPC-CIDR}"
6774
}
6875
ingress_security_rules {
6976
tcp_options {
77+
"max" = 0
78+
"min" = 0
7079
}
7180
protocol = "6"
72-
source = "${var.VCP-CIDR}"
81+
source = "${var.VPC-CIDR}"
7382
}
7483
}
7584

@@ -98,7 +107,7 @@ resource "baremetal_core_subnet" "WebSubnetAD1" {
98107
compartment_id = "${var.compartment_ocid}"
99108
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
100109
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
101-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
110+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
102111
}
103112

104113
resource "baremetal_core_subnet" "WebSubnetAD2" {
@@ -108,7 +117,7 @@ resource "baremetal_core_subnet" "WebSubnetAD2" {
108117
compartment_id = "${var.compartment_ocid}"
109118
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
110119
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
111-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
120+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
112121
}
113122

114123
resource "baremetal_core_subnet" "WebSubnetAD3" {
@@ -118,7 +127,7 @@ resource "baremetal_core_subnet" "WebSubnetAD3" {
118127
compartment_id = "${var.compartment_ocid}"
119128
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
120129
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
121-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
130+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
122131
}
123132

124133
resource "baremetal_core_subnet" "PrivateSubnetAD1" {
@@ -128,7 +137,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD1" {
128137
compartment_id = "${var.compartment_ocid}"
129138
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
130139
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
131-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
140+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
132141
}
133142

134143
resource "baremetal_core_subnet" "PrivateSubnetAD2" {
@@ -138,7 +147,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD2" {
138147
compartment_id = "${var.compartment_ocid}"
139148
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
140149
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
141-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
150+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
142151
}
143152

144153
resource "baremetal_core_subnet" "PrivateSubnetAD3" {
@@ -148,7 +157,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD3" {
148157
compartment_id = "${var.compartment_ocid}"
149158
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
150159
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
151-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
160+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
152161
}
153162

154163
resource "baremetal_core_subnet" "BastionSubnetAD1" {
@@ -158,7 +167,7 @@ resource "baremetal_core_subnet" "BastionSubnetAD1" {
158167
compartment_id = "${var.compartment_ocid}"
159168
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
160169
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
161-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
170+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
162171
}
163172

164173
resource "baremetal_core_subnet" "BastionSubnetAD2" {
@@ -168,7 +177,7 @@ resource "baremetal_core_subnet" "BastionSubnetAD2" {
168177
compartment_id = "${var.compartment_ocid}"
169178
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
170179
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
171-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
180+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
172181
}
173182

174183
resource "baremetal_core_subnet" "BastionSubnetAD3" {
@@ -178,5 +187,5 @@ resource "baremetal_core_subnet" "BastionSubnetAD3" {
178187
compartment_id = "${var.compartment_ocid}"
179188
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
180189
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
181-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
190+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
182191
}

‎docs/examples/Secure_MongoDB/secure_mongodb.tf‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ variable "VPC-CIDR" {
1717
}
1818

1919
variable "ADs" {
20-
default = ["Ucom:PHX-AD-1", "Ucom:PHX-AD-2", "Ucom:PHX-AD-3"]
20+
default = ["Uocm:PHX-AD-1", "Uocm:PHX-AD-2", "Uocm:PHX-AD-3"]
2121
}
2222

2323
resource "baremetal_core_virtual_network" "CompleteVCN" {
24-
cidr_block = "${var.VCP-CIDR}"
24+
cidr_block = "${var.VPC-CIDR}"
2525
compartment_id = "${var.compartment_ocid}"
2626
display_name = "CompleteVCN"
2727
}
@@ -40,6 +40,7 @@ resource "baremetal_core_route_table" "RouteForComplete" {
4040
cidr_block = "0.0.0.0/0"
4141
network_entity_id = "${baremetal_core_internet_gateway.CompleteIG.id}"
4242
}
43+
}
4344

4445
resource "baremetal_core_security_list" "WebSubnet" {
4546
compartment_id = "${var.compartment_ocid}"
@@ -64,12 +65,20 @@ resource "baremetal_core_security_list" "PrivateSubnet" {
6465
display_name = "Private"
6566
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
6667
egress_security_rules {
68+
tcp_options {
69+
"max" = 0
70+
"min" = 0
71+
}
72+
protocol = "6"
73+
destination = "${var.VPC-CIDR}"
6774
}
6875
ingress_security_rules {
6976
tcp_options {
77+
"max" = 0
78+
"min" = 0
7079
}
7180
protocol = "6"
72-
source = "${var.VCP-CIDR}"
81+
source = "${var.VPC-CIDR}"
7382
}
7483
}
7584

@@ -98,7 +107,7 @@ resource "baremetal_core_subnet" "WebSubnetAD1" {
98107
compartment_id = "${var.compartment_ocid}"
99108
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
100109
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
101-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
110+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
102111
}
103112

104113
resource "baremetal_core_subnet" "WebSubnetAD2" {
@@ -108,7 +117,7 @@ resource "baremetal_core_subnet" "WebSubnetAD2" {
108117
compartment_id = "${var.compartment_ocid}"
109118
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
110119
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
111-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
120+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
112121
}
113122

114123
resource "baremetal_core_subnet" "WebSubnetAD3" {
@@ -118,7 +127,7 @@ resource "baremetal_core_subnet" "WebSubnetAD3" {
118127
compartment_id = "${var.compartment_ocid}"
119128
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
120129
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
121-
security_list_ids = "${baremetal_core_security_list.WebSubnet.id}"
130+
security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
122131
}
123132

124133
resource "baremetal_core_subnet" "PrivateSubnetAD1" {
@@ -128,7 +137,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD1" {
128137
compartment_id = "${var.compartment_ocid}"
129138
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
130139
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
131-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
140+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
132141
}
133142

134143
resource "baremetal_core_subnet" "PrivateSubnetAD2" {
@@ -138,7 +147,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD2" {
138147
compartment_id = "${var.compartment_ocid}"
139148
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
140149
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
141-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
150+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
142151
}
143152

144153
resource "baremetal_core_subnet" "PrivateSubnetAD3" {
@@ -148,7 +157,7 @@ resource "baremetal_core_subnet" "PrivateSubnetAD3" {
148157
compartment_id = "${var.compartment_ocid}"
149158
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
150159
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
151-
security_list_ids = "${baremetal_core_security_list.PrivateSubnet.id}"
160+
security_list_ids = ["${baremetal_core_security_list.PrivateSubnet.id}"]
152161
}
153162

154163
resource "baremetal_core_subnet" "BastionSubnetAD1" {
@@ -158,7 +167,7 @@ resource "baremetal_core_subnet" "BastionSubnetAD1" {
158167
compartment_id = "${var.compartment_ocid}"
159168
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
160169
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
161-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
170+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
162171
}
163172

164173
resource "baremetal_core_subnet" "BastionSubnetAD2" {
@@ -168,7 +177,7 @@ resource "baremetal_core_subnet" "BastionSubnetAD2" {
168177
compartment_id = "${var.compartment_ocid}"
169178
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
170179
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
171-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
180+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
172181
}
173182

174183
resource "baremetal_core_subnet" "BastionSubnetAD3" {
@@ -178,5 +187,5 @@ resource "baremetal_core_subnet" "BastionSubnetAD3" {
178187
compartment_id = "${var.compartment_ocid}"
179188
vcn_id = "${baremetal_core_virtual_network.CompleteVCN.id}"
180189
route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
181-
security_list_ids = "${baremetal_core_security_list.BastionSubnet.id}"
190+
security_list_ids = ["${baremetal_core_security_list.BastionSubnet.id}"]
182191
}

0 commit comments

Comments
 (0)