summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-11-22 11:23:18 -0500
committerGitHub <noreply@github.com>2016-11-22 11:23:18 -0500
commit134c6200d1c24131da456808a7b8b7f59a14f91d (patch)
tree21d151bb4d11d9aab222348bf6fadf152670551c
parentbfc9239e746be21a11207478d492522e299e13d3 (diff)
parente72b278849be850f0202e9f837bb6fba76f0f0b0 (diff)
downloadopenshift-134c6200d1c24131da456808a7b8b7f59a14f91d.tar.gz
openshift-134c6200d1c24131da456808a7b8b7f59a14f91d.tar.bz2
openshift-134c6200d1c24131da456808a7b8b7f59a14f91d.tar.xz
openshift-134c6200d1c24131da456808a7b8b7f59a14f91d.zip
Merge pull request #2837 from vishpat/service-account
Modified the error message being checked for
-rw-r--r--roles/nuage_master/tasks/serviceaccount.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/nuage_master/tasks/serviceaccount.yml b/roles/nuage_master/tasks/serviceaccount.yml
index 2b3ae0454..41143772e 100644
--- a/roles/nuage_master/tasks/serviceaccount.yml
+++ b/roles/nuage_master/tasks/serviceaccount.yml
@@ -29,7 +29,7 @@
--config={{nuage_tmp_conf}}
with_items: "{{nuage_tasks}}"
register: osnuage_perm_task
- failed_when: "'already exists' not in osnuage_perm_task.stderr and osnuage_perm_task.rc != 0"
+ failed_when: "'the object has been modified' not in osnuage_perm_task.stderr and osnuage_perm_task.rc != 0"
changed_when: osnuage_perm_task.rc == 0
- name: Generate the node client config