Merge pull request #131 from AniruddhaNayek/disa_stig

Change the order of Compliance suite and PB & Update pod count

Author: ppc64le-cloud-bot

playbooks/roles/ocp-disa-stig-compliance/tasks/main.yml

@@ -84,7 +84,7 @@
     - name: Check if pods are running
       shell: oc get pods -n openshift-compliance --no-headers | grep "Running" | wc -l
       register: compliance_pods
-      until: compliance_pods.stdout|int == 2
+      until: compliance_pods.stdout|int == 3
       retries: 15
       delay: 60
 

playbooks/roles/ocp-disa-stig-compliance/tasks/rhcos4_disa_stig.yml

@@ -1,4 +1,26 @@
 ---
+- name: Create Profile Bundle
+  block:
+  - name: Create Profile Bundle
+    kubernetes.core.k8s:
+      state: present
+      definition:
+        apiVersion: compliance.openshift.io/v1alpha1
+        kind: ProfileBundle
+        metadata:
+          name: rhcos4-disa-stig
+          namespace: openshift-compliance
+        spec:
+          contentFile: "{{ rhcos4_contentfile }}"
+          contentImage: "{{ content_image }}"
+
+  - name: Check the profile bundle status
+    shell: oc get ProfileBundle rhcos4-disa-stig | awk 'NR==2 {print $4}'
+    register: pbstatus
+    until: pbstatus.stdout == "VALID"
+    retries: 10
+    delay: 60
+
 - name: Create Compliance suite
   block:
   - name: Create suite
@@ -27,28 +49,6 @@
     retries: 10
     delay: 60
 
-- name: Create Profile Bundle
-  block:
-  - name: Create Profile Bundle
-    kubernetes.core.k8s:
-      state: present
-      definition:
-        apiVersion: compliance.openshift.io/v1alpha1
-        kind: ProfileBundle
-        metadata:
-          name: rhcos4-disa-stig
-          namespace: openshift-compliance
-        spec:
-          contentFile: "{{ rhcos4_contentfile }}"
-          contentImage: "{{ content_image }}"
-
-  - name: Check the profile bundle status
-    shell: oc get ProfileBundle rhcos4-disa-stig | awk 'NR==2 {print $4}'
-    register: pbstatus
-    until: pbstatus.stdout == "VALID"
-    retries: 10
-    delay: 60
-
 - name: Create SSB
   block:
   - name: Create SSB