소스 검색

Renaming csr to bootstrap for consistency.

Kenny Woodson 7 년 전
부모
커밋
a4081ec354
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      roles/openshift_aws/templates/user_data.j2
  2. 1 1
      roles/openshift_node/tasks/bootstrap.yml

+ 1 - 1
roles/openshift_aws/templates/user_data.j2

@@ -9,7 +9,7 @@ write_files:
   content: |
   content: |
     openshift_group_type: {{ openshift_aws_node_group_type }}
     openshift_group_type: {{ openshift_aws_node_group_type }}
 {%   if openshift_aws_node_group_type != 'master' %}
 {%   if openshift_aws_node_group_type != 'master' %}
-- path: /etc/origin/node/csr_kubeconfig
+- path: /etc/origin/node/bootstrap.kubeconfig
   owner: 'root:root'
   owner: 'root:root'
   permissions: '0640'
   permissions: '0640'
   encoding: b64
   encoding: b64

+ 1 - 1
roles/openshift_node/tasks/bootstrap.yml

@@ -25,7 +25,7 @@
     state: "{{ item.state | default('present') }}"
     state: "{{ item.state | default('present') }}"
   with_items:
   with_items:
   # add the kubeconfig
   # add the kubeconfig
-  - line: "KUBECONFIG=/etc/origin/node/csr_kubeconfig"
+  - line: "KUBECONFIG=/etc/origin/node/bootstrap.kubeconfig"
     regexp: "^KUBECONFIG=.*"
     regexp: "^KUBECONFIG=.*"
   # remove the config file.  This comes from openshift_facts
   # remove the config file.  This comes from openshift_facts
   - regexp: "^CONFIG_FILE=.*"
   - regexp: "^CONFIG_FILE=.*"