summaryrefslogtreecommitdiffstats
path: root/roles/nuage_master/tasks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-10-18 09:39:21 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-10-19 10:00:30 -0300
commit3ea0166aa301990d4f95fdb1c48557e710aa0b05 (patch)
tree233baede8c077ce2d7225328121ce6155af31cb7 /roles/nuage_master/tasks
parent9fa3c6c98420e4e340507193fd3ad80c15e5c19e (diff)
downloadopenshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.gz
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.bz2
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.tar.xz
openshift-3ea0166aa301990d4f95fdb1c48557e710aa0b05.zip
Switch from "oadm" to "oc adm" and fix bug in binary sync.
Found bug syncing binaries to containerized hosts where if a symlink was pre-existing, but pointing to the wrong destination, it would not be corrected. Switched to using oc adm instead of oadm.
Diffstat (limited to 'roles/nuage_master/tasks')
-rw-r--r--roles/nuage_master/tasks/serviceaccount.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/nuage_master/tasks/serviceaccount.yml b/roles/nuage_master/tasks/serviceaccount.yml
index 5b4af5824..2b3ae0454 100644
--- a/roles/nuage_master/tasks/serviceaccount.yml
+++ b/roles/nuage_master/tasks/serviceaccount.yml
@@ -16,7 +16,7 @@
shell: >
echo {{ nuage_service_account_config | to_json | quote }} |
{{ openshift.common.client_binary }} create
- -n default
+ -n default
--config={{nuage_tmp_conf}}
-f -
register: osnuage_create_service_account
@@ -25,7 +25,7 @@
- name: Configure role/user permissions
command: >
- {{ openshift.common.admin_binary }} {{item}}
+ {{ openshift.common.client_binary }} adm {{item}}
--config={{nuage_tmp_conf}}
with_items: "{{nuage_tasks}}"
register: osnuage_perm_task
@@ -34,7 +34,7 @@
- name: Generate the node client config
command: >
- {{ openshift.common.admin_binary }} create-api-client-config
+ {{ openshift.common.client_binary }} adm create-api-client-config
--certificate-authority={{ openshift_master_ca_cert }}
--client-dir={{ cert_output_dir }}
--master={{ openshift.master.api_url }}