diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-10-27 14:45:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 14:45:49 -0400 |
| commit | ef0b6ee84abbd83738f3e4465f05c3261114086e (patch) | |
| tree | 6174fb0b360e4bc7753b945de2a5407b54e1131b | |
| parent | adbc3884c5fcb0a0bb3f5284794f380af7eab447 (diff) | |
| parent | a4081ec3540d34b31cda8cab1f50377dbae8e075 (diff) | |
| download | openshift-ef0b6ee84abbd83738f3e4465f05c3261114086e.tar.gz openshift-ef0b6ee84abbd83738f3e4465f05c3261114086e.tar.bz2 openshift-ef0b6ee84abbd83738f3e4465f05c3261114086e.tar.xz openshift-ef0b6ee84abbd83738f3e4465f05c3261114086e.zip | |
Merge pull request #5887 from kwoodson/rename_csr
Renaming csr to bootstrap for consistency.
| -rw-r--r-- | roles/openshift_aws/templates/user_data.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_aws/templates/user_data.j2 b/roles/openshift_aws/templates/user_data.j2 index ed9c0ed0b..76aebdcea 100644 --- a/roles/openshift_aws/templates/user_data.j2 +++ b/roles/openshift_aws/templates/user_data.j2 @@ -9,7 +9,7 @@ write_files: content: | openshift_group_type: {{ openshift_aws_node_group_type }} {% if openshift_aws_node_group_type != 'master' %} -- path: /etc/origin/node/csr_kubeconfig +- path: /etc/origin/node/bootstrap.kubeconfig owner: 'root:root' permissions: '0640' encoding: b64 diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml index 8c03f6c41..2deb005da 100644 --- a/roles/openshift_node/tasks/bootstrap.yml +++ b/roles/openshift_node/tasks/bootstrap.yml @@ -25,7 +25,7 @@ state: "{{ item.state | default('present') }}" with_items: # add the kubeconfig - - line: "KUBECONFIG=/etc/origin/node/csr_kubeconfig" + - line: "KUBECONFIG=/etc/origin/node/bootstrap.kubeconfig" regexp: "^KUBECONFIG=.*" # remove the config file. This comes from openshift_facts - regexp: "^CONFIG_FILE=.*" |