style: Adjust variable names

roles/player/defaults/main.yaml

@@ -32,7 +32,6 @@ fp_parameter_file: parameters.yaml
 fp_image_registry: ''
 fp_image_name: informaticsmatters/fragmentor-player
 fp_image_tag: '1.2.0'
-fp_image_pull_policy: 'IfNotPresent'
 
 # The nextflow version to run.
 # The player image generally contains the 'latest' nextflow version.
@@ -47,8 +46,10 @@ fp_image_pull_policy: 'IfNotPresent'
 #
 # See https://github.com/nextflow-io/nextflow/issues/1902
 fp_nextflow_version: '21.02.0-edge'
-# And the Nextflow queue size
-fp_nextflow_queue_size: 100
+# And the Nextflow executor queue size
+fp_nextflow_executor_queue_size: 100
+# And Pod pull policy
+fp_nextflow_pod_image_pull_policy: 'IfNotPresent'
 
 # A pull-secret for public images pulled from DockerHub.
 # If set this is the base-64 string that can be used as the value

roles/player/tasks/deploy.yaml

@@ -11,8 +11,8 @@
 
 - name: Assert queue size
   assert:
-    that: fp_nextflow_queue_size|int > 0
-    fail_msg: You must set a sensible 'fp_nextflow_queue_size'
+    that: fp_nextflow_executor_queue_size|int > 0
+    fail_msg: You must set a sensible 'fp_nextflow_executor_queue_size'
 
 # Assert the Kubernetes config has been named and exists
 

roles/player/templates/configmap-nextflow-config.yaml.j2

@@ -16,12 +16,12 @@ data:
 {% if all_image_preset_pullsecret_name|string|length > 0 %}
         imagePullSecret: '{{ all_image_preset_pullsecret_name }}',
 {% endif %}
-        imagePullPolicy: '{{ fp_image_pull_policy }}'
+        imagePullPolicy: '{{ fp_nextflow_pod_image_pull_policy }}'
       ]
     }
     executor {
         name = 'k8s'
-        queueSize = {{ fp_nextflow_queue_size }}
+        queueSize = {{ fp_nextflow_executor_queue_size }}
     }
     k8s {
         serviceAccount = 'fragmentor'