diff --git a/roles/shiftstack/README.md b/roles/shiftstack/README.md index 88fa0bbe7c..8d76b8ef50 100644 --- a/roles/shiftstack/README.md +++ b/roles/shiftstack/README.md @@ -25,6 +25,11 @@ Role for triggering Openshift on Openstack QA automation (installation and tests * `cifmw_shiftstack_sc`: (*string*) The storage class to be used for PVC for the shiftstackclient pod. Defaults to `local-storage`. * `cifmw_shiftstack_shiftstackclient_artifacts_dir`: (*string*) The artifacts directory path for the shiftstackclient pod. Defaults to `/home/cloud-admin/artifacts`. * `cifmw_shiftstack_shiftstackclient_incluster_kubeconfig_dir`: (*string*) The directory path in shiftstackclient pod the will hold the RHOSO kubeconfig. Defaults to `/home/cloud-admin/incluster-kubeconfig`. +* `cifmw_shiftstack_client_pod_ram_requests`: (*string*) Memory request for the shiftstackclient pod. Defaults to `12Gi`. +* `cifmw_shiftstack_client_pod_ram_limits`: (*string*) Memory limit for the shiftstackclient pod. Defaults to `12Gi`. +* `cifmw_shiftstack_client_pod_cpu_requests`: (*string*) CPU request for the shiftstackclient pod. Defaults to `4`. +* `cifmw_shiftstack_client_pod_cpu_limits`: (*string*) CPU limit for the shiftstackclient pod. Defaults to `4`. +* `cifmw_shiftstack_storage_access_mode`: (*list*) A list of storage access mode for shiftstack pvc. defaults to `['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany']` ## Examples The role is imported in the test playbook, i.e. when: diff --git a/roles/shiftstack/defaults/main.yml b/roles/shiftstack/defaults/main.yml index 7136359fad..963d132101 100644 --- a/roles/shiftstack/defaults/main.yml +++ b/roles/shiftstack/defaults/main.yml @@ -40,3 +40,11 @@ cifmw_shiftstack_sc: "local-storage" cifmw_shiftstack_shiftstackclient_artifacts_dir: "/home/cloud-admin/artifacts" cifmw_shiftstack_shiftstackclient_installation_dir: "{{ cifmw_shiftstack_shiftstackclient_artifacts_dir }}/installation" cifmw_shiftstack_shiftstackclient_incluster_kubeconfig_dir: "/home/cloud-admin/incluster-kubeconfig" +cifmw_shiftstack_client_pod_ram_requests: "12Gi" +cifmw_shiftstack_client_pod_ram_limits: "12Gi" +cifmw_shiftstack_client_pod_cpu_requests: "4" +cifmw_shiftstack_client_pod_cpu_limits: "4" +cifmw_shiftstack_storage_access_mode: + - ReadWriteOnce + - ReadWriteMany + - ReadOnlyMany diff --git a/roles/shiftstack/templates/shiftstackclient_pod.yml.j2 b/roles/shiftstack/templates/shiftstackclient_pod.yml.j2 index eeddac0eea..034f90b66a 100644 --- a/roles/shiftstack/templates/shiftstackclient_pod.yml.j2 +++ b/roles/shiftstack/templates/shiftstackclient_pod.yml.j2 @@ -18,11 +18,11 @@ spec: {% else %} resources: requests: - memory: "12Gi" - cpu: "4" + memory: "{{ cifmw_shiftstack_client_pod_ram_requests }}" + cpu: "{{ cifmw_shiftstack_client_pod_cpu_requests }}" limits: - memory: "12Gi" - cpu: "4" + memory: "{{ cifmw_shiftstack_client_pod_ram_limits }}" + cpu: "{{ cifmw_shiftstack_client_pod_cpu_limits }}" {% endif %} securityContext: privileged: true diff --git a/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 b/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 index dfd85bb0d8..3d14912ed1 100644 --- a/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 +++ b/roles/shiftstack/templates/shiftstackclient_pvc.yml.j2 @@ -5,10 +5,7 @@ metadata: namespace: {{ cifmw_shiftstack_client_pod_namespace }} spec: storageClassName: {{ cifmw_shiftstack_sc }} - accessModes: - - ReadWriteOnce - - ReadWriteMany - - ReadOnlyMany + accessModes: {{ cifmw_shiftstack_storage_access_mode }} resources: requests: storage: 2Gi