Changed variable name for access modes

ACCESS_MODES -> PVCSCALE_ACCESS_MODES

Added new variable PVCSCALE_NODESELECTOR to cover case when pods are required to start on nodes with particular label.

Author: ekuric

docs/pvcscale.md

@@ -115,10 +115,15 @@ This is default PVC size. If specified as `1Gi` then all Pods will get `1Gi` PVC
 Default: None  
 The storageclass which will be used to allocated PVCs. It has to be present on cluster and must be functional for test to work. Default is unset and must be changed prior running test and adapted to name of functional storage class name.
 
-### ACCESS_MODES
+### PVCSCALE_ACCESS_MODES
 Default: `ReadWriteOnce`  
-`ACCESS_MODES` is access_mode for PVC inside Pod. This field does not affect the test itself and might be removed in the future.
+`PVCSCALE_ACCESS_MODES` is access_mode for PVC inside Pod. This field does not affect the test itself and might be removed in the future.
 
+### PVCSCALE_NODESELECTOR
+
+Default: None
+If there is need for Pods to start on specific nodes based on node selector this parameter will ensure that Pods
+are starting on nodes with desired labels. It is prerequst that nodes are labeled with proper labels. 
 ### Smoke test variables
 
 ```

workloads/templates/workload-pvcscale-script-cm.yml.j2

@@ -283,6 +283,7 @@ data:
           basename: {{ pvcscale_basename }}
           tuning: default
           ifexists: delete
+          nodeselector: {{ pvcscale_nodeselector }}
           templates:
             - num: {{ pvcscale_maxpods }}
               basename: pvcscale
@@ -314,7 +315,7 @@ data:
           volume.beta.kubernetes.io/storage-class: {{ pvcscale_storageclass }}
       spec:
         accessModes:
-         - {{ access_modes }}
+         - {{ pvcscale_access_modes }}
         resources:
           requests:
             storage: {{ pvcscale_storage_size }}

workloads/vars/pvcscale.yml

@@ -41,6 +41,7 @@ pvcscale_maxpods: "{{ lookup('env', 'PVCSCALE_MAXPODS')|default(10, true)|int }}
 pvcscale_pod_image: "{{ lookup('env', 'PVCSCALE_POD_IMAGE')|default('quay.io/openshift-scale/scale-ci-workload', true) }}"
 pvcscale_stepsize: "{{ lookup('env', 'PVCSCALE_STEPSIZE')|default(1, true)|int }}"
 pvcscale_pause: "{{ lookup('env', 'PVCSCALE_PAUSE')|default(0, true)|int }}"
-pvcscale_storage_size: "{{ lookup('env', 'PVCSCALE_STORAGE_SIZE')|default('1Gi',true) }}"
+pvcscale_storage_size: "{{ lookup('env', 'PVCSCALE_STORAGE_SIZE')|default('1Gi', true) }}"
 pvcscale_storageclass: "{{ lookup('env', 'PVCSCALE_STORAGECLASS')|default('', true) }}"
-access_modes: "{{ lookup('env', 'ACCESS_MODES')|default('ReadWriteOnce',true) }}"
+pvcscale_access_modes: "{{ lookup('env', 'PVCSCALE_ACCESS_MODES')|default('ReadWriteOnce',true) }}"
+pvcscale_nodeselector: "{{ lookup('env', 'PVCSCALE_NODESELECTOR')|default('', true) }}"