Filter OL images by display name for NAT instance. Resolves #36.

Author: jlamillan

k8s-oci.tf

@@ -32,6 +32,7 @@ module "vcn" {
   public_subnet_ssh_ingress               = "${var.public_subnet_ssh_ingress}"
   public_subnet_http_ingress              = "${var.public_subnet_http_ingress}"
   public_subnet_https_ingress             = "${var.public_subnet_https_ingress}"
+  nat_instance_oracle_linux_image_name    = "${var.oracle_linux_image_name}"
   nat_instance_shape                      = "${var.natInstanceShape}"
   nat_instance_ad1_enabled                = "${var.nat_instance_ad1_enabled}"
   nat_instance_ad2_enabled                = "${var.nat_instance_ad2_enabled}"

network/vcn/datasources.tf

@@ -3,11 +3,10 @@ data "oci_identity_availability_domains" "ADs" {
   compartment_id = "${var.tenancy_ocid}"
 }
 
-# Gets the OCID of the OS image to use for the NAT instance
+# Prevent oci_core_images image list from changing underneath us.
 data "oci_core_images" "ImageOCID" {
-  compartment_id           = "${var.compartment_ocid}"
-  operating_system         = "Oracle Linux"
-  operating_system_version = "${var.nat_instance_os_ver}"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "${var.nat_instance_oracle_linux_image_name}"
 }
 
 # Gets a list of VNIC attachments on the NAT instance in AD 1

network/vcn/variables.tf

@@ -94,8 +94,8 @@ variable "public_subnet_https_ingress" {
 
 variable "nat_instance_ssh_public_key_openssh" {}
 
-variable "nat_instance_os_ver" {
-  default = "7.4"
+variable "nat_instance_oracle_linux_image_name" {
+  default = "Oracle-Linux-7.4-2017.10.25-0"
 }
 
 variable "nat_instance_shape" {