Merge pull request #30 from malscent/main

Updated Image generation on GCP
couchbase-partners · Mar 26, 2021 · 271b076 · 271b076
2 parents 9976f9e + f999fd4
commit 271b076
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/gcp/couchbase-enterprise-edition-byol/couchbase.py b/gcp/couchbase-enterprise-edition-byol/couchbase.py
@@ -1,7 +1,7 @@
 import naming
 
 def GenerateConfig(context):
-    license = 'byol'
+    license = '-ee-byol'
 
     config={}
     config['resources'] = []

diff --git a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py
@@ -1,7 +1,7 @@
 import naming
 
 def GenerateConfig(context):
-    license = 'hourly-pricing'
+    license = '-ee-hourly-pricing'
 
     config={}
     config['resources'] = []

diff --git a/gcp/shared/group.py b/gcp/shared/group.py
@@ -249,15 +249,15 @@ def GenerateStartupScript(context, runtimeconfigName):
 
 def _SyncGatewayImageUrl(license, useFamily):
     if useFamily:
-        return URL_BASE + 'couchbase-public/global/images/family/couchbase-sync-gateway-ee-' + license
+        return URL_BASE + 'couchbase-public/global/images/family/couchbase-sync-gateway' + license
     else:
-        return URL_BASE + 'couchbase-public/global/images/couchbase-sync-gateway-ee-' + license + '-v20200923'
+        return URL_BASE + 'couchbase-public/global/images/couchbase-sync-gateway' + license + '-v20200923'
 
 def _ServerImageUrl(license, useFamily):
     if (useFamily):
-        return URL_BASE + 'couchbase-public/global/images/family/couchbase-server-ee-' + license
+        return URL_BASE + 'couchbase-public/global/images/family/couchbase-server' + license
     else:
-        return URL_BASE + 'couchbase-public/global/images/couchbase-server-ee-' + license + '-v20200923'
+        return URL_BASE + 'couchbase-public/global/images/couchbase-server' + license + '-v20200923'
 
 def _WaiterSuccessPath(clusterName, groupName):
     return 'status/clusters/%s/groups/%s/success' % (clusterName, groupName)