- Fixed broken logic in AWX

InformaticsMatters · Feb 14, 2020 · 50b2d0b · 50b2d0b
1 parent 66f5d8f
commit 50b2d0b
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/roles/infrastructure/tasks/deploy.yaml b/roles/infrastructure/tasks/deploy.yaml
@@ -287,16 +287,6 @@
       that:
       - ax_cert_issuer in cert_issuer_set
 
-  - name: AWX pre-flight check
-    assert:
-      that:
-      - ax_admin|length > 0
-      - ax_admin != 'SetMe'
-      - ax_admin_password|length > 0
-      - ax_admin_password != 'SetMe'
-    when:
-    - ax_force|bool or ax_ss_result.resources|length == 0
-
   # Extract current AWX version.
   # If it's different then force a re-deploy,
   # otherwise skip the AWX stage.
@@ -332,6 +322,14 @@
   - name: AWX installation block
     block:
 
+    - name: AWX pre-flight check
+      assert:
+        that:
+        - ax_admin|length > 0
+        - ax_admin != 'SetMe'
+        - ax_admin_password|length > 0
+        - ax_admin_password != 'SetMe'
+
     - name: Ensure AWX clone directory
       file:
         path: "{{ ax_clone_dir }}"