diff --git a/README.md b/README.md index a820588..c4b36bc 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ For details of the architecture, see [_Deploy a highly available Apache Cassandr - Permission to `manage` the following types of resources in your Oracle Cloud Infrastructure tenancy: `vcns`, `internet-gateways`, `route-tables`, `security-lists`, `subnets`, and `instances`. -- Quota to create the following resources: 1 VCN, 1 subnet, 1 Internet Gateway, 1 NAT Gateway, 1 route rules, and 6 compute instance. +- Quota to create the following resources: 1 VCN, 1 subnet, 1 Internet Gateway, 1 NAT Gateway, 1 route rules, and 6 compute instances (Cassandra nodes). If you don't have the required permissions and quota, contact your tenancy administrator. See [Policy Reference](https://docs.cloud.oracle.com/en-us/iaas/Content/Identity/Reference/policyreference.htm), [Service Limits](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/servicelimits.htm), [Compartment Quotas](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcequotas.htm). ## 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://console.us-phoenix-1.oraclecloud.com/resourcemanager/stacks/create?region=home&zipUrl=https://github.com/oracle-quickstart/oci-arch-cassandra/raw/master/resource-manager/oci-arch-cassandra.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-arch-cassandra/raw/master/resource-manager/oci-arch-cassandra.zip) If you aren't already signed in, when prompted, enter the tenancy and user credentials. diff --git a/cassandra.tf b/cassandra.tf index 43d7668..75fb8f9 100644 --- a/cassandra.tf +++ b/cassandra.tf @@ -15,4 +15,5 @@ module "cassandra" { ssl_storage_port = var.ssl_storage_port ssh_authorized_keys = tls_private_key.public_private_key_pair.public_key_openssh ssh_private_key = tls_private_key.public_private_key_pair.private_key_pem + cassandra_version = var.cassandra_version } diff --git a/resource-manager/oci-arch-cassandra.zip b/resource-manager/oci-arch-cassandra.zip index 9e6fb36..7e2e56b 100644 Binary files a/resource-manager/oci-arch-cassandra.zip and b/resource-manager/oci-arch-cassandra.zip differ diff --git a/schema.yaml b/schema.yaml index 867680e..241f7a4 100755 --- a/schema.yaml +++ b/schema.yaml @@ -22,6 +22,7 @@ variableGroups: - title: Optional Configuration visible: true variables: + - cassandra_version - instance_os - linux_os_version - vcn_cidr @@ -75,6 +76,16 @@ variables: title: "Number of seed nodes in Cassandra cluster" description: "Choose the number of seed nodes in Cassandra cluster." + cassandra_version: + type: enum + required: false + visible: true + title: "Cassandra version" + description: "Choose version of Cassandra." + default: "3.11.10" + enum: + - "3.11.10" + vcn_cidr: type: string visible: true diff --git a/variables.tf b/variables.tf index 37c5d99..2e36698 100644 --- a/variables.tf +++ b/variables.tf @@ -48,3 +48,8 @@ variable "storage_port" { variable "ssl_storage_port" { default = 7001 } + +variable "cassandra_version" { + description = "Version of Cassandra software" + default = "3.11.10" +}