From 0d614913d1ca74f78b13e6fa7922fdc3b150abe6 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sun, 8 Oct 2017 20:43:45 +0000 Subject: [PATCH] Turns out 'global' is not a valid variable name Signed-off-by: Patrick Uiterwijk --- roles/openshift/object/tasks/main.yml | 4 ++-- roles/openshift/project/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml index a7a70ccc8d..908117eae5 100644 --- a/roles/openshift/object/tasks/main.yml +++ b/roles/openshift/object/tasks/main.yml @@ -21,12 +21,12 @@ - name: Call `oc apply` on the copied file shell: oc -n {{app}} apply -f {{tmpfile.path}} run_once: true - when: global is not defined or not global + when: global_object is not defined or not global_object - name: GLOBAL call `oc apply` on the copied file shell: oc apply -f {{tmpfile.path}} run_once: true - when: global is defined and global + when: global_object is defined and global_object - name: Delete temporary file file: path={{tmpfile.path}} state=absent diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml index 73d5259326..728788e30c 100644 --- a/roles/openshift/project/tasks/main.yml +++ b/roles/openshift/project/tasks/main.yml @@ -36,7 +36,7 @@ vars: template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml" # Namespace-local roles are unusable until Openshift 3.6. Remove this global: true when upgraded. - global: true + global_object: true - name: appowners.yml include_role: