First release fixes

Author: lfeldman

README.md

@@ -16,7 +16,8 @@ If you don't have the required permissions and quota, contact your tenancy admin
 
 ## Deploy Using Oracle Resource Manager
 
-1. Click [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-redis/raw/master/resource-manager/oci-redis.zip)
+1. Click [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-redis/releases/latest/download/oci-redis-stack-latest.zip)
+
 
     If you aren't already signed in, when prompted, enter the tenancy and user credentials.
 

network.tf

@@ -3,6 +3,9 @@ resource "oci_core_virtual_network" "redis-vcn" {
   compartment_id = var.compartment_ocid
   display_name   = "${var.redis-prefix}-vcn"
   dns_label      = var.redis-prefix
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+
 }
 
 resource "oci_core_subnet" "redis-subnet" {
@@ -14,12 +17,16 @@ resource "oci_core_subnet" "redis-subnet" {
   vcn_id            = oci_core_virtual_network.redis-vcn.id
   route_table_id    = oci_core_route_table.redis-rt.id
   dhcp_options_id   = oci_core_virtual_network.redis-vcn.default_dhcp_options_id
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_internet_gateway" "redis-igw" {
   compartment_id = var.compartment_ocid
   display_name   = "${var.redis-prefix}-igw"
   vcn_id         = oci_core_virtual_network.redis-vcn.id
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_route_table" "redis-rt" {
@@ -32,5 +39,7 @@ resource "oci_core_route_table" "redis-rt" {
     destination_type  = "CIDR_BLOCK"
     network_entity_id = oci_core_internet_gateway.redis-igw.id
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 

redis_masters.tf

@@ -21,6 +21,8 @@ resource "oci_core_instance" "redis1" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_instance" "redis2" {
@@ -45,6 +47,8 @@ resource "oci_core_instance" "redis2" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_instance" "redis3" {
@@ -69,5 +73,7 @@ resource "oci_core_instance" "redis3" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+  
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 

redis_replicas.tf

@@ -21,6 +21,8 @@ resource "oci_core_instance" "redis4" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_instance" "redis5" {
@@ -45,6 +47,8 @@ resource "oci_core_instance" "redis5" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 
 resource "oci_core_instance" "redis6" {
@@ -69,5 +73,7 @@ resource "oci_core_instance" "redis6" {
   metadata = {
     ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh
   }
+
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
 }
 

schema.yaml

@@ -33,6 +33,7 @@ variableGroups:
   - instance_shape
   - instance_os
   - linux_os_version
+  - release
 
 variables:
 
@@ -148,7 +149,13 @@ variables:
     description: "Choose Operating system version for Redis compute instances."
     enum:
       - "7.8"
-
+  
+  release:
+    type: string
+    required: false
+    visible: false
+    title: "Reference Architecture Release (OCI Architecture Center)"
+    
 outputs:
 
   redis1_public_ip_address:

security_lists.tf

@@ -9,6 +9,8 @@ resource "oci_core_security_list" "redis-securitylist" {
   vcn_id         = oci_core_virtual_network.redis-vcn.id
   display_name   = "${var.redis-prefix}-securitylist"
 
+  defined_tags = {"${oci_identity_tag_namespace.ArchitectureCenterTagNamespace.name}.${oci_identity_tag.ArchitectureCenterTag.name}" = var.release }
+
   egress_security_rules {
     protocol    = local.tcp_protocol
     destination = local.anywhere

tags.tf

@@ -0,0 +1,25 @@
+resource "oci_identity_tag_namespace" "ArchitectureCenterTagNamespace" {
+    compartment_id = var.compartment_ocid
+    description = "ArchitectureCenterTagNamespace"
+    name = "ArchitectureCenter\\deploy-redis-cluster"
+  
+    provisioner "local-exec" {
+       command = "sleep 10"
+    }
+}
+
+resource "oci_identity_tag" "ArchitectureCenterTag" {
+    description = "ArchitectureCenterTag"
+    name = "release"
+    tag_namespace_id = oci_identity_tag_namespace.ArchitectureCenterTagNamespace.id
+
+    validator {
+        validator_type = "ENUM"
+        values         = ["release", "1.0"]
+    }
+
+    provisioner "local-exec" {
+       command = "sleep 20"
+    }
+
+}

variables.tf

@@ -6,6 +6,11 @@ variable "region" {}
 variable "compartment_ocid" {}
 variable "availablity_domain_name" {}
 
+variable "release" {
+  description = "Reference Architecture Release (OCI Architecture Center)"
+  default     = "1.0"
+}
+
 variable "VCN-CIDR" {
   default = "10.0.0.0/16"
 }