From 945593b25631fed204f5bb143cd016dc13db4043 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Thu, 5 Aug 2021 14:27:26 -0400 Subject: [PATCH] Added updates for Couchbase Server 6.6.3 --- .../couchbase-amzn-lnx2.template | 1 + .../couchbase-amzn-lnx2.template | 1 + .../createUiDefinition.json | 4 ++++ .../couchbase.py.schema | 1 + .../couchbase.py.schema | 1 + gcp/shared/group.py.schema | 21 ++++++------------- script_url.txt | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template index 1934a0e..20e2441 100644 --- a/aws/CouchbaseServer/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServer/couchbase-amzn-lnx2.template @@ -72,6 +72,7 @@ "Type": "String", "Default": "7.0.0", "AllowedValues": [ + "6.6.3", "6.6.2", "6.6.1", "6.6.0", diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template index 3f5513c..eea3287 100644 --- a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template @@ -42,6 +42,7 @@ "Default": "7.0.0", "AllowedValues": [ "7.0.0", + "6.6.3", "6.6.2", "6.6.1", "6.6.0", diff --git a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json index 6900a75..8f49161 100644 --- a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json +++ b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json @@ -312,6 +312,10 @@ "label": "7.0.0 (recommended)", "value": "7.0.0" }, + { + "label": "6.6.3", + "value": "6.6.3" + }, { "label": "6.6.2", "value": "6.6.2" diff --git a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema index bb1c186..9669cd8 100755 --- a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema +++ b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema @@ -114,6 +114,7 @@ properties: default: 7.0.0 enum: - 7.0.0 + - 6.6.3 - 6.6.2 - 6.6.1 - 6.6.0 diff --git a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema index f8b968d..774571b 100755 --- a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema +++ b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema @@ -114,6 +114,7 @@ properties: default: 7.0.0 enum: - 7.0.0 + - 6.6.3 - 6.6.2 - 6.6.1 - 6.6.0 diff --git a/gcp/shared/group.py.schema b/gcp/shared/group.py.schema index 38a9e9a..a86a7d4 100644 --- a/gcp/shared/group.py.schema +++ b/gcp/shared/group.py.schema @@ -22,29 +22,21 @@ properties: description: Type of Couchbase license to be supported by the deployment. serverVersion: type: string - default: 6.6.1 + default: 7.0.0 enum: + - 7.0.0 + - 6.6.3 + - 6.6.2 - 6.6.1 - 6.6.0 + - 6.5.2 - 6.5.1 - 6.5.0 - 6.0.4 - 6.0.3 - 6.0.2 - 6.0.1 - - 5.5.6 - - 5.5.5 - - 5.5.4 - - 5.5.3 - - 5.5.2 - - 5.5.1 - - 5.5.0 - - 5.1.3 - - 5.1.2 - - 5.1.1 - - 5.1.0 - - 5.0.1 - - 5.0.0 + - 6.0.0 syncGatewayVersion: type: string default: 2.8.2 @@ -65,7 +57,6 @@ properties: - 2.0.2 - 2.0.0 - 1.5.2 - - 1.5.1 couchbaseUsername: type: string diff --git a/script_url.txt b/script_url.txt index 55712fc..aa95e7d 100644 --- a/script_url.txt +++ b/script_url.txt @@ -1 +1 @@ -https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.13/couchbase_installer.sh \ No newline at end of file +https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.14/couchbase_installer.sh \ No newline at end of file