From 82d61ae9e23c2ae1f722ed3b458a6e39721e71fd Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Thu, 31 Aug 2017 18:01:56 -0400
Subject: Refactor openshift_hosted plays and role

Currently, openshift_hosted role duplicates some logic
across separate task chains.  This commit cleans up
the openshift_hosted role and converts it to be
primarily used with include_role to give better
logic to the playbooks that utilize this role.

This commit also refactors the playbook that calls
various openshift_hosted roles into individual playbooks.
This allows more granularity for advanced users.
---
 roles/cockpit-ui/tasks/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'roles/cockpit-ui/tasks')

diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index 0114498f8..244e2cc41 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -50,7 +50,9 @@
       -n default
     register: deploy_registry_console
     changed_when: "'already exists' not in deploy_registry_console.stderr"
-    failed_when: "'already exists' not in deploy_registry_console.stderr and deploy_registry_console.rc != 0"
+    failed_when:
+    - "'already exists' not in deploy_registry_console.stderr"
+    - "deploy_registry_console.rc != 0"
 
   - name: Delete temp directory
     file:
-- 
cgit v1.2.3