Update example image version to Oracle Linux 7.4 (#341)

briangustafson · web-flow · commit 9134249ee65b · 2017-10-31T16:16:04.000-07:00
Many of our examples and tests default to using Oracle Linux 7.3.
While 7.3 images can still be used if you know the OCID, they are no longer
returned by ListImages. Updating to 7.4 for now, but this is a short term
solution while we determine the correct way to handle updates to ListImages.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .terraform
 terraform.tfstate*
+.terraform.tfstate.lock.info
 tf.plan
 *.tfvars
 *.orig
diff --git a/data_source_obmcs_core_images_test.go b/data_source_obmcs_core_images_test.go
@@ -41,7 +41,7 @@ func (s *DatasourceCoreImageTestSuite) TestAccImage_basic() {
 				data "oci_core_images" "t" {
 					compartment_id = "${var.compartment_id}"
 					operating_system = "Oracle Linux"
-					operating_system_version = "7.3"
+					operating_system_version = "7.4"
 				
 					filter {
 						name = "display_name"
@@ -56,7 +56,7 @@ func (s *DatasourceCoreImageTestSuite) TestAccImage_basic() {
 					resource.TestCheckResourceAttr(s.ResourceName, "images.0.display_name", "Oracle-Linux-7.3-2017.07.17-1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "images.0.state", "AVAILABLE"),
 					resource.TestCheckResourceAttr(s.ResourceName, "images.0.operating_system", "Oracle Linux"),
-					resource.TestCheckResourceAttr(s.ResourceName, "images.0.operating_system_version", "7.3"),
+					resource.TestCheckResourceAttr(s.ResourceName, "images.0.operating_system_version", "7.4"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "images.0.time_created"),
 				),
 			},
diff --git a/data_source_obmcs_core_instances_test.go b/data_source_obmcs_core_instances_test.go
@@ -53,7 +53,7 @@ func (s *DatasourceCoreInstanceTestSuite) SetupTest() {
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
 		operating_system = "Oracle Linux"
-		operating_system_version = "7.3"
+		operating_system_version = "7.4"
 		limit = 1
 	}
 
diff --git a/docs/examples/clusters/Mongodb/variables.tf b/docs/examples/clusters/Mongodb/variables.tf
@@ -22,7 +22,7 @@ variable "InstanceOS" {
 }
 
 variable "InstanceOSVersion" {
-    default = "7.3"
+    default = "7.4"
 }
 
 variable "VPC-CIDR" {
diff --git a/docs/examples/compute/extended_metadata/extended_metadata.tf b/docs/examples/compute/extended_metadata/extended_metadata.tf
@@ -32,7 +32,7 @@ data "oci_identity_availability_domains" "ADs" {
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
     operating_system = "Oracle Linux"
-    operating_system_version = "7.3"
+    operating_system_version = "7.4"
 }
 
 # Gets a list of vNIC attachments on the instance
diff --git a/docs/examples/compute/instance/variables.tf b/docs/examples/compute/instance/variables.tf
@@ -24,7 +24,7 @@ variable "InstanceOS" {
 }
 
 variable "InstanceOSVersion" {
-    default = "7.3"
+    default = "7.4"
 }
 
 variable "DBSize" {
diff --git a/docs/examples/compute/instance_lite/instance_lite.tf b/docs/examples/compute/instance_lite/instance_lite.tf
@@ -30,7 +30,7 @@ data "oci_identity_availability_domains" "ADs" {
 data "oci_core_images" "image-list" {
   compartment_id = "${var.compartment_ocid}"
   operating_system = "Oracle Linux"
-  operating_system_version = "7.3"
+  operating_system_version = "7.4"
 }
 
 resource "oci_core_instance" "instance1" {
diff --git a/docs/examples/compute/multi_vnic/multi_vnic.tf b/docs/examples/compute/multi_vnic/multi_vnic.tf
@@ -24,7 +24,7 @@ variable "InstanceOS" {
 }
 
 variable "InstanceOSVersion" {
-    default = "7.3"
+    default = "7.4"
 }
 
 provider "oci" {
diff --git a/docs/examples/compute/private_ip/private_ip.tf b/docs/examples/compute/private_ip/private_ip.tf
@@ -33,7 +33,7 @@ data "oci_identity_availability_domains" "ADs" {
 data "oci_core_images" "OLImageOCID" {
     compartment_id = "${var.compartment_ocid}"
     operating_system = "Oracle Linux"
-    operating_system_version = "7.3"
+    operating_system_version = "7.4"
 }
 
 # Create Instance
diff --git a/docs/examples/load_balancer/lb_full/lb_full.tf b/docs/examples/load_balancer/lb_full/lb_full.tf
@@ -123,7 +123,7 @@ resource "oci_core_security_list" "securitylist1" {
 data "oci_core_images" "image-list" {
   compartment_id = "${var.compartment_ocid}"
   operating_system = "Oracle Linux"
-  operating_system_version = "7.3"
+  operating_system_version = "7.4"
 }
 
 resource "oci_core_instance" "instance1" {
diff --git a/docs/examples/storage/nfs/variables.tf b/docs/examples/storage/nfs/variables.tf
@@ -24,7 +24,7 @@ variable "InstanceOS" {
 }
 
 variable "InstanceOSVersion" {
-    default = "7.3"
+    default = "7.4"
 }
 
 variable "2TB" {
diff --git a/docs/solutions/chef/variables.tf b/docs/solutions/chef/variables.tf
@@ -24,7 +24,7 @@ variable "InstanceOS" {
 }
 
 variable "InstanceOSVersion" {
-  default = "7.3"
+  default = "7.4"
 }
 
 variable "BootStrapFile" {
diff --git a/provider_test.go b/provider_test.go
@@ -82,7 +82,7 @@ var instanceConfig = subnetConfig + `
 data "oci_core_images" "t" {
 	compartment_id = "${var.compartment_id}"
   	operating_system = "Oracle Linux"
-  	operating_system_version = "7.3"
+  	operating_system_version = "7.4"
   	limit = 1
 }
 
@@ -144,7 +144,7 @@ resource "oci_core_subnet" "t" {
 data "oci_core_images" "t" {
 	compartment_id = "${var.compartment_id}"
   	operating_system = "Oracle Linux"
-  	operating_system_version = "7.3"
+  	operating_system_version = "7.4"
   	limit = 1
 }
 
diff --git a/resource_obmcs_core_instance_test.go b/resource_obmcs_core_instance_test.go
@@ -59,7 +59,7 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
 		operating_system = "Oracle Linux"
-		operating_system_version = "7.3"
+		operating_system_version = "7.4"
 		limit = 1
 	}`
 
diff --git a/resource_obmcs_core_volume_attachment_test.go b/resource_obmcs_core_volume_attachment_test.go
@@ -52,7 +52,7 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_id}"
 		operating_system = "Oracle Linux"
-		operating_system_version = "7.3"
+		operating_system_version = "7.4"
 		limit = 1
 	}
 	
diff --git a/test_templates.go b/test_templates.go
@@ -57,7 +57,7 @@ func testImage1() string {
 	data "oci_core_images" "t" {
 		compartment_id = "${var.compartment_ocid}"
 		operating_system = "Oracle Linux"
-		operating_system_version = "7.3"
+		operating_system_version = "7.4"
 		limit = 1
 	}`
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (s *DatasourceCoreInstanceTestSuite) SetupTest() {`
`53`	`53`	`data "oci_core_images" "t" {`
`54`	`54`	`compartment_id = "${var.compartment_id}"`
`55`	`55`	`operating_system = "Oracle Linux"`
`56`		`- operating_system_version = "7.3"`
	`56`	`+ operating_system_version = "7.4"`
`57`	`57`	`limit = 1`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ variable "InstanceOS" {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`variable "InstanceOSVersion" {`
`25`		`- default = "7.3"`
	`25`	`+ default = "7.4"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`variable "VPC-CIDR" {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ data "oci_identity_availability_domains" "ADs" {`
`32`	`32`	`data "oci_core_images" "OLImageOCID" {`
`33`	`33`	`compartment_id = "${var.compartment_ocid}"`
`34`	`34`	`operating_system = "Oracle Linux"`
`35`		`- operating_system_version = "7.3"`
	`35`	`+ operating_system_version = "7.4"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Gets a list of vNIC attachments on the instance`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ variable "InstanceOS" {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`variable "InstanceOSVersion" {`
`27`		`- default = "7.3"`
	`27`	`+ default = "7.4"`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`variable "DBSize" {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ data "oci_identity_availability_domains" "ADs" {`
`30`	`30`	`data "oci_core_images" "image-list" {`
`31`	`31`	`compartment_id = "${var.compartment_ocid}"`
`32`	`32`	`operating_system = "Oracle Linux"`
`33`		`- operating_system_version = "7.3"`
	`33`	`+ operating_system_version = "7.4"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`resource "oci_core_instance" "instance1" {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ data "oci_identity_availability_domains" "ADs" {`
`33`	`33`	`data "oci_core_images" "OLImageOCID" {`
`34`	`34`	`compartment_id = "${var.compartment_ocid}"`
`35`	`35`	`operating_system = "Oracle Linux"`
`36`		`- operating_system_version = "7.3"`
	`36`	`+ operating_system_version = "7.4"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`# Create Instance`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ resource "oci_core_security_list" "securitylist1" {`
`123`	`123`	`data "oci_core_images" "image-list" {`
`124`	`124`	`compartment_id = "${var.compartment_ocid}"`
`125`	`125`	`operating_system = "Oracle Linux"`
`126`		`- operating_system_version = "7.3"`
	`126`	`+ operating_system_version = "7.4"`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`resource "oci_core_instance" "instance1" {`