summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-30 23:04:45 -0700
committerGitHub <noreply@github.com>2017-10-30 23:04:45 -0700
commitb4cd211feee6f2f632572e27986b17e32ad13b0b (patch)
tree08ac1334fb9b637e3a737cdc8fd1a14522dca7cd
parentaebb674d2c829c6dab041cc57d54af965947639d (diff)
parent928fe5110a9db9750657cd48b08674de53296d6f (diff)
downloadopenshift-b4cd211feee6f2f632572e27986b17e32ad13b0b.tar.gz
openshift-b4cd211feee6f2f632572e27986b17e32ad13b0b.tar.bz2
openshift-b4cd211feee6f2f632572e27986b17e32ad13b0b.tar.xz
openshift-b4cd211feee6f2f632572e27986b17e32ad13b0b.zip
Merge pull request #5933 from kwoodson/remove_unneeded_setup
Automatic merge from submit-queue. Removing unneeded bootstrap which moved into the product. Removing unneeded code now that it has moved officially into the product.
-rw-r--r--roles/openshift_master/tasks/bootstrap.yml17
1 files changed, 0 insertions, 17 deletions
diff --git a/roles/openshift_master/tasks/bootstrap.yml b/roles/openshift_master/tasks/bootstrap.yml
index eee89743c..cb51b5839 100644
--- a/roles/openshift_master/tasks/bootstrap.yml
+++ b/roles/openshift_master/tasks/bootstrap.yml
@@ -1,21 +1,4 @@
---
-
-- name: ensure the node-bootstrap service account exists
- oc_serviceaccount:
- name: node-bootstrapper
- namespace: openshift-infra
- state: present
- run_once: true
-
-- name: grant node-bootstrapper the correct permissions to bootstrap
- oc_adm_policy_user:
- namespace: openshift-infra
- user: system:serviceaccount:openshift-infra:node-bootstrapper
- resource_kind: cluster-role
- resource_name: system:node-bootstrapper
- state: present
- run_once: true
-
# TODO: create a module for this command.
# oc_serviceaccounts_kubeconfig
- name: create service account kubeconfig with csr rights