summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-11-01 19:25:28 +0000
committerKenny Woodson <kwoodson@redhat.com>2017-11-01 21:18:32 +0000
commit388cc390ad22a41669dd8ea4cd7c09756ee5bd7c (patch)
tree8c9265c20d6569d02408d0d3da6c1b74c00a2b5d /roles
parent97887d45581c3df8a8bffff9b3028e74646255a3 (diff)
downloadopenshift-388cc390ad22a41669dd8ea4cd7c09756ee5bd7c.tar.gz
openshift-388cc390ad22a41669dd8ea4cd7c09756ee5bd7c.tar.bz2
openshift-388cc390ad22a41669dd8ea4cd7c09756ee5bd7c.tar.xz
openshift-388cc390ad22a41669dd8ea4cd7c09756ee5bd7c.zip
Adding CONFIG_FILE option back.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/defaults/main.yml3
-rw-r--r--roles/openshift_node/tasks/bootstrap.yml6
2 files changed, 6 insertions, 3 deletions
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: