summaryrefslogtreecommitdiffstats
path: root/roles/nuage_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-19 13:55:01 -0400
committerGitHub <noreply@github.com>2016-10-19 13:55:01 -0400
commit7025459e3e4f02494e8b005623af52ca738317b4 (patch)
treeafa9662170d4bbf216fbd124d638eea825433489 /roles/nuage_master
parent3be15dae0b039e06e31b4eecc933851ada7446cb (diff)
parent3ea0166aa301990d4f95fdb1c48557e710aa0b05 (diff)
downloadopenshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.gz
openshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.bz2
openshift-7025459e3e4f02494e8b005623af52ca738317b4.tar.xz
openshift-7025459e3e4f02494e8b005623af52ca738317b4.zip
Merge pull request #2621 from dgoodwin/symlink-fix
Switch from "oadm" to "oc adm" and fix bug in binary sync.
Diffstat (limited to 'roles/nuage_master')
-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 }}