From 97887d45581c3df8a8bffff9b3028e74646255a3 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Wed, 1 Nov 2017 18:55:48 +0000 Subject: Configurable node config location. --- roles/openshift_node/tasks/bootstrap.yml | 6 +++--- 1 file 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 -- cgit v1.2.3