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 | |
| 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')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/bootstrap.yml | 8 |
2 files changed, 7 insertions, 4 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 cf22181a8..8cf41ab4c 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_config_dir }}/bootstrap.kubeconfig" regexp: "^KUBECONFIG=.*" # remove the config file. This comes from openshift_facts - - regexp: "^CONFIG_FILE=.*" - state: absent + - line: "CONFIG_FILE={{ openshift_node_config_dir }}/node-config.yaml" + regexp: "^CONFIG_FILE=.*" - name: include aws sysconfig credentials include: aws.yml @@ -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: |