summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-11-01 18:55:48 +0000
committerKenny Woodson <kwoodson@redhat.com>2017-11-01 18:55:48 +0000
commit97887d45581c3df8a8bffff9b3028e74646255a3 (patch)
tree6491e9629f1faa81d2bab59f67b9d1aa2bf8a796 /roles
parent5bfc68706be9127199a3f3f06e04588720ed50f5 (diff)
downloadopenshift-97887d45581c3df8a8bffff9b3028e74646255a3.tar.gz
openshift-97887d45581c3df8a8bffff9b3028e74646255a3.tar.bz2
openshift-97887d45581c3df8a8bffff9b3028e74646255a3.tar.xz
openshift-97887d45581c3df8a8bffff9b3028e74646255a3.zip
Configurable node config location.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/bootstrap.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index cf22181a8..b39f77a50 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -25,11 +25,11 @@
state: "{{ item.state | default('present') }}"
with_items:
# add the kubeconfig
- - line: "KUBECONFIG=/etc/origin/node/bootstrap.kubeconfig"
+ - line: "KUBECONFIG={{ openshift_node_data_dir }}/bootstrap.kubeconfig"
regexp: "^KUBECONFIG=.*"
# remove the config file. This comes from openshift_facts
- - regexp: "^CONFIG_FILE=.*"
- state: absent
+ - line: "CONFIG_FILE={{ openshift_node_data_dir }}/"
+ regexp: "^CONFIG_FILE=.*"
- name: include aws sysconfig credentials
include: aws.yml