From f9cdca4bca99b42ff3030bccdb9766808d293420 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Tue, 18 Jun 2024 11:07:53 -0400 Subject: [PATCH] fixed a missed reference --- gcp/couchbase-server/couchbase.py | 2 ++ gcp/couchbase-server/resources/instance_template.py.schema | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcp/couchbase-server/couchbase.py b/gcp/couchbase-server/couchbase.py index 923c3c5..7696b08 100644 --- a/gcp/couchbase-server/couchbase.py +++ b/gcp/couchbase-server/couchbase.py @@ -65,6 +65,8 @@ def generate_config(context): 'nameSuffix': suffix, 'network': context.properties['network'], 'serverVersion': context.properties['serverVersion'], + 'serverInstanceType': context.properties['serverNodeType'], + 'defaultZone': context.properties['defaultZone'], 'runtimeConfigName': '$(ref.{}.runtimeConfigName)'.format(config['name']), 'networkTag': '$(ref.{}.ruleTag)'.format(firewallRule['name']), 'bootImage': bootDiskImage, diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema index 4aa362b..f3cb8d5 100644 --- a/gcp/couchbase-server/resources/instance_template.py.schema +++ b/gcp/couchbase-server/resources/instance_template.py.schema @@ -13,7 +13,7 @@ properties: type: GCE_NETWORK gceNetwork: allowSharedVpcs: True - machineTypeProperty: serverNodeType + machineTypeProperty: serverInstanceType subnetwork: type: array minItems: 1 @@ -23,6 +23,9 @@ properties: zoneProperty: defaultZone gceSubnetwork: networkProperty: network + defaultZone: + type: string + default: us-central1-f serverVersion: type: string default: 7.6.0