From 61c88b0a0d637a449e826e824ab154ae63a27c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Fri, 11 Aug 2017 12:36:27 +0200
Subject: [PATCH] when using "oc get -o name", types are now suffixed with an
 "s"

---
 roles/3scale/tasks/main.yml   | 2 +-
 roles/microcks/tasks/main.yml | 4 ++--
 roles/sso/tasks/main.yml      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/3scale/tasks/main.yml b/roles/3scale/tasks/main.yml
index f820b45..60e9bf0 100644
--- a/roles/3scale/tasks/main.yml
+++ b/roles/3scale/tasks/main.yml
@@ -7,7 +7,7 @@
 
   - name: Create a new project for 3scale
     command: oc new-project "{{ threescale_project }}"
-    when: '"project/" ~ threescale_project not in oc_get_projects.stdout_lines'
+    when: '"projects/" ~ threescale_project not in oc_get_projects.stdout_lines'
 
   - include: common/status.yml
     vars:
diff --git a/roles/microcks/tasks/main.yml b/roles/microcks/tasks/main.yml
index ecf5ff3..c86ace4 100644
--- a/roles/microcks/tasks/main.yml
+++ b/roles/microcks/tasks/main.yml
@@ -13,7 +13,7 @@
 
   - name: Create a new project for Microcks
     command: oc new-project "{{ microcks_project }}"
-    when: '"project/" ~ microcks_project not in oc_get_projects.stdout_lines'
+    when: '"projects/" ~ microcks_project not in oc_get_projects.stdout_lines'
 
   - name: Query existing deploymentconfigs
     command: oc get dc -n "{{ microcks_project }}" -o name -l "component={{ microcks_application_name }}"
@@ -22,7 +22,7 @@
 
   - name: Deploy app if needed
     set_fact:
-      deploy_needed: "{{ 'deploymentconfig/' ~ microcks_application_name not in oc_get_dc.stdout_lines }}"
+      deploy_needed: "{{ 'deploymentconfigs/' ~ microcks_application_name not in oc_get_dc.stdout_lines }}"
 
   - name: Process the OpenShift Template and create the OpenShift objects
     command: oc new-app -n {{ microcks_project }} --template={{ microcks_template_name }} -p MEMORY_LIMIT=1Gi
diff --git a/roles/sso/tasks/main.yml b/roles/sso/tasks/main.yml
index 588de65..a82bbf4 100644
--- a/roles/sso/tasks/main.yml
+++ b/roles/sso/tasks/main.yml
@@ -45,7 +45,7 @@
 
   - name: Create a new project for SSO
     command: oc new-project "{{ sso_project }}"
-    when: '"project/" ~ sso_project not in oc_get_projects.stdout_lines'
+    when: '"projects/" ~ sso_project not in oc_get_projects.stdout_lines'
 
   - name: Query existing deploymentconfigs
     command: oc get dc -n "{{ sso_project }}" -o name -l "application={{ sso_application_name }}"
@@ -54,7 +54,7 @@
 
   - name: Deploy app if needed
     set_fact:
-      deploy_needed: "{{ 'deploymentconfig/' ~ sso_application_name not in oc_get_dc.stdout_lines }}"
+      deploy_needed: "{{ 'deploymentconfigs/' ~ sso_application_name not in oc_get_dc.stdout_lines }}"
 
   - name: Create a service account for SSO
     command: oc create serviceaccount sso-service-account -n "{{ sso_project }}"