diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-02 21:28:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 21:28:02 -0700 |
| commit | e90e612be39a36474076a99a6937bbcd079c3be0 (patch) | |
| tree | 875700e7e5993e3e7325a9385f656ebff33095ac /roles/openshift_node/defaults | |
| parent | aa8230f5ec8f2f6185ea347a9d3a88c461462d2d (diff) | |
| parent | 388cc390ad22a41669dd8ea4cd7c09756ee5bd7c (diff) | |
| download | openshift-e90e612be39a36474076a99a6937bbcd079c3be0.tar.gz openshift-e90e612be39a36474076a99a6937bbcd079c3be0.tar.bz2 openshift-e90e612be39a36474076a99a6937bbcd079c3be0.tar.xz openshift-e90e612be39a36474076a99a6937bbcd079c3be0.zip | |
Merge pull request #5979 from kwoodson/move_node_config_location
Automatic merge from submit-queue.
Configurable node config location.
Allow the node config location to be configurable.
This currently defaults to /var/lib/origin. It should be /etc/origin/node/node-config.yaml.
Diffstat (limited to 'roles/openshift_node/defaults')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 3 |
1 files changed, 3 insertions, 0 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 }}" |