Skip to content

Commit 49c7516

Browse files
committed
make db system example self sufficient
1 parent 7ffc880 commit 49c7516

File tree

4 files changed

+44
-9
lines changed

4 files changed

+44
-9
lines changed

docs/examples/db_systems/datasources.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Gets a list of Availability Domains
2-
data "oci_identity_availability_domains" "availability_domains" {
2+
data "oci_identity_availability_domains" "ADs" {
33
compartment_id = "${var.tenancy_ocid}"
44
}
55

@@ -70,7 +70,7 @@ data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
7070
}
7171

7272
data "oci_database_db_system_shapes" "test_db_system_shapes" {
73-
availability_domain = "${lookup(data.oci_identity_availability_domains.availability_domains.availability_domains[0],"name")}"
73+
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
7474
compartment_id = "${var.compartment_ocid}"
7575

7676
filter {
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
resource "oci_core_virtual_network" "vcn" {
2+
cidr_block = "10.1.0.0/16"
3+
compartment_id = "${var.compartment_ocid}"
4+
display_name = "TFExampleVCNDBSystem"
5+
dns_label = "tfexamplevcndbsystem"
6+
}
7+
8+
resource "oci_core_subnet" "subnet" {
9+
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
10+
cidr_block = "10.1.20.0/24"
11+
display_name = "TFExampleSubnetDBSystem"
12+
dns_label = "tfexamplesubnetdbsystem"
13+
security_list_ids = ["${oci_core_virtual_network.vcn.default_security_list_id}"]
14+
compartment_id = "${var.compartment_ocid}"
15+
vcn_id = "${oci_core_virtual_network.vcn.id}"
16+
route_table_id = "${oci_core_route_table.route_table.id}"
17+
dhcp_options_id = "${oci_core_virtual_network.vcn.default_dhcp_options_id}"
18+
}
19+
20+
resource "oci_core_internet_gateway" "internet_gateway" {
21+
compartment_id = "${var.compartment_ocid}"
22+
display_name = "TFExampleIGDBSystem"
23+
vcn_id = "${oci_core_virtual_network.vcn.id}"
24+
}
25+
26+
resource "oci_core_route_table" "route_table" {
27+
compartment_id = "${var.compartment_ocid}"
28+
vcn_id = "${oci_core_virtual_network.vcn.id}"
29+
display_name = "TFExampleRouteTableDBSystem"
30+
31+
route_rules {
32+
destination = "0.0.0.0/0"
33+
destination_type = "CIDR_BLOCK"
34+
network_entity_id = "${oci_core_internet_gateway.internet_gateway.id}"
35+
}
36+
}

docs/examples/db_systems/resources.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "oci_database_db_system" "test_db_system" {
2-
availability_domain = "${lookup(data.oci_identity_availability_domains.availability_domains.availability_domains[0],"name")}"
2+
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
33
compartment_id = "${var.compartment_ocid}"
44
cpu_core_count = "${lookup(data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0], "minimum_core_count")}"
55
database_edition = "${var.db_edition}"
@@ -24,7 +24,7 @@ resource "oci_database_db_system" "test_db_system" {
2424

2525
disk_redundancy = "${var.db_disk_redundancy}"
2626
shape = "${var.db_system_shape}"
27-
subnet_id = "${var.subnet_ocid}"
27+
subnet_id = "${oci_core_subnet.subnet.id}"
2828
ssh_public_keys = ["${var.ssh_public_key}"]
2929
display_name = "${var.db_system_display_name}"
3030

docs/examples/db_systems/variables.tf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ variable "compartment_ocid" {}
88
variable "ssh_public_key" {}
99
variable "ssh_private_key" {}
1010

11-
variable "subnet_ocid" {}
1211

1312
# Choose an Availability Domain
14-
variable "availability_domain_index" {
15-
default = "1"
13+
variable "availability_domain" {
14+
default = "2"
1615
}
1716

1817
# DBSystem specific
1918
variable "db_system_shape" {
20-
default = "BM.HighIO1.36"
19+
default = "VM.Standard1.1"
2120
}
2221

2322
variable "cpu_core_count" {
@@ -29,7 +28,7 @@ variable "db_edition" {
2928
}
3029

3130
variable "db_admin_password" {
32-
default = "BEstrO0ng_#11"
31+
default = "BEstrO0ng_#12"
3332
}
3433

3534
variable "db_name" {

0 commit comments

Comments
 (0)