From 388cc390ad22a41669dd8ea4cd7c09756ee5bd7c Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 1 Nov 2017 19:25:28 +0000
Subject: Adding CONFIG_FILE option back.

---
 roles/openshift_node/defaults/main.yml   | 3 +++
 roles/openshift_node/tasks/bootstrap.yml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'roles/openshift_node')

diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index 37f48e724..0c6d8db38 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -110,5 +110,8 @@ openshift_node_use_kuryr: "{{ openshift_node_use_kuryr_default }}"
 openshift_node_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}"
 openshift_node_data_dir: "{{ openshift_node_data_dir_default }}"
 
+openshift_node_config_dir_default: "/etc/origin/node"
+openshift_node_config_dir: "{{ openshift_node_config_dir_default }}"
+
 openshift_node_image_config_latest_default: "{{ openshift_image_config_latest | default(False) }}"
 openshift_node_image_config_latest: "{{ openshift_node_image_config_latest_default }}"
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index b39f77a50..8cf41ab4c 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -25,10 +25,10 @@
     state: "{{ item.state | default('present') }}"
   with_items:
   # add the kubeconfig
-  - line: "KUBECONFIG={{ openshift_node_data_dir }}/bootstrap.kubeconfig"
+  - line: "KUBECONFIG={{ openshift_node_config_dir }}/bootstrap.kubeconfig"
     regexp: "^KUBECONFIG=.*"
   # remove the config file.  This comes from openshift_facts
-  - line: "CONFIG_FILE={{ openshift_node_data_dir }}/"
+  - line: "CONFIG_FILE={{ openshift_node_config_dir }}/node-config.yaml"
     regexp: "^CONFIG_FILE=.*"
 
 - name: include aws sysconfig credentials
@@ -76,7 +76,7 @@
     state: link
     force: yes
   with_items:
-  - /var/lib/origin/openshift.local.config/node/node-client-ca.crt
+  - "{{ openshift_node_config_dir }}/node-client-ca.crt"
 
 - when: rpmgenerated_config.stat.exists
   block:
-- 
cgit v1.2.3