Merge pull request #2 from oracle-quickstart/kevindl30-patch-1

Kevindl30 patch 1
oracle-quickstart · Dec 8, 2021 · d64c42d · d64c42d
2 parents 2b91751 + 64489cd
commit d64c42d
Show file tree

Hide file tree

Showing 59 changed files with 5,721 additions and 1,625 deletions.
diff --git a/.github/workflows/build-simple-orm.yml b/.github/workflows/build-simple-orm.yml
diff --git a/README.md b/README.md
diff --git a/build-orm/install.tf b/build-orm/install.tf
diff --git a/compute.tf b/compute.tf
diff --git a/data_sources.tf b/data_sources.tf
@@ -1,19 +1,31 @@
-data "oci_identity_availability_domain" "ad" {
- compartment_id = var.tenancy_ocid
- ad_number = var.availability_domain_number
-}
-
-data "oci_core_images" "autonomous_ol7" {
- compartment_id = var.compute_compartment_ocid
- operating_system = "Oracle Autonomous Linux"
- sort_by = "TIMECREATED"
- sort_order = "DESC"
- state = "AVAILABLE"
-
- # filter restricts to OL 7
- filter {
- name = "operating_system_version"
- values = ["7\\.[0-9]"]
- regex = true
- }
-}
+// Copyright (c) 2019, 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.
+/*
+data "oci_core_services" "all_oci_services" {
+ filter {
+ name = "name"
+ values = ["All .* Services In Oracle Services Network"]
+ regex = true
+ }
+ count = var.create_service_gateway == true ? 1 : 0
+}
+
+*/
+
+
+// Get all availability domains for the region
+data "oci_identity_availability_domains" "ads" {
+ compartment_id = "${var.tenancy_ocid}"
+}
+
+
+/* Enable to gain visibility to updated parameters
+data "oci_ocvp_supported_skus" "supported_skus" {
+ compartment_id = "${var.compartment_ocid}"
+}
+
+data "oci_ocvp_supported_vmware_software_versions" "supported_vmware_software_versions" {
+ compartment_id = "${var.compartment_ocid}"
+}
+*/
+
diff --git a/image_subscription.tf b/image_subscription.tf
diff --git a/images/cluster.png b/images/cluster.png
diff --git a/images/network.png b/images/network.png
diff --git a/images/nsg.png b/images/nsg.png
diff --git a/images/vcn.png b/images/vcn.png
diff --git a/locals.tf b/locals.tf