Merge branch 'bigip_module_fix' into 'main'

fix python error in bigip modules See merge request cloudsolutions/automation-templates/f5-google-gdm-templates-v2!128
F5Networks · Feb 28, 2023 · eb7ce64 · eb7ce64
2 parents 8b12866 + f8541cc
commit eb7ce64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/examples/modules/bigip-autoscale/bigip_autoscale.py b/examples/modules/bigip-autoscale/bigip_autoscale.py
@@ -68,7 +68,7 @@ def create_instance_template(context, instance_template):
         'bigIqSecretId' in context.properties else ''
     secret_id = str(context.properties['secretId']) if \
         'secretId' in context.properties else ''
-    source_image = ''.join([COMPUTE_URL_BASE, 'projects/', context.properties['customImageId'],]) if context.properties['customImageId'] else \
+    source_image = ''.join([COMPUTE_URL_BASE, 'projects/', context.properties['customImageId'],]) if 'customImageId' in context.properties and context.properties['customImageId'] else \
         ''.join([COMPUTE_URL_BASE, 'projects/f5-7626-networks-public/global/images/', context.properties['imageName'],])
     telemetry_flag = '' if context.properties['allowUsageAnalytics'] else '--skip-telemetry'
     properties = {}

diff --git a/examples/modules/bigip-standalone/bigip_standalone.py b/examples/modules/bigip-standalone/bigip_standalone.py
@@ -101,7 +101,7 @@ def create_instance(context):
     name = context.properties.get('name') or \
         context.env['name']
     instance_name = generate_name(context.properties['uniqueString'], name)
-    source_image = ''.join([COMPUTE_URL_BASE, 'projects/', context.properties['customImageId'],]) if context.properties['customImageId'] else \
+    source_image = ''.join([COMPUTE_URL_BASE, 'projects/', context.properties['customImageId'],]) if 'customImageId' in context.properties and context.properties['customImageId'] else \
         ''.join([COMPUTE_URL_BASE, 'projects/f5-7626-networks-public/global/images/', context.properties['imageName'],])
     properties = {}
     # Setup Defaults - property updated to given value when property exists in config