diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-17 19:53:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 19:53:41 -0400 |
| commit | 553ce409a40305a984894a980fc3969c11f41aba (patch) | |
| tree | e5c6b74566286dc8b71f9ddd79e3742dbb319fad | |
| parent | 6c3b7338a46bd7a1017e3af571a2ad9c58a3fa9d (diff) | |
| parent | 991cb8d7333e109d1ec30b47b324ef5dd8edb098 (diff) | |
| download | openshift-553ce409a40305a984894a980fc3969c11f41aba.tar.gz openshift-553ce409a40305a984894a980fc3969c11f41aba.tar.bz2 openshift-553ce409a40305a984894a980fc3969c11f41aba.tar.xz openshift-553ce409a40305a984894a980fc3969c11f41aba.zip | |
Merge pull request #2611 from abutcher/systemd-units-node-config
Build full node config path in systemd_units tasks.
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 64c90db50..1de63ecc3 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -76,7 +76,7 @@ # TODO: add the validate parameter when there is a validation command to run - name: Create the Node config template: - dest: "{{ openshift_node_config_file }}" + dest: "{{ openshift.common.config_base }}/node/node-config.yaml" src: node.yaml.v1.j2 backup: true owner: root diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index 40d1dd50b..27c9b48f0 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -42,7 +42,7 @@ - regex: '^OPTIONS=' line: "OPTIONS=--loglevel={{ openshift.node.debug_level | default(2) }}" - regex: '^CONFIG_FILE=' - line: "CONFIG_FILE={{ openshift_node_config_file }}" + line: "CONFIG_FILE={{ openshift.common.config_base }}/node/node-config.yaml" - regex: '^IMAGE_VERSION=' line: "IMAGE_VERSION={{ openshift_image_tag }}" notify: diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml deleted file mode 100644 index 77a9694de..000000000 --- a/roles/openshift_node/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -openshift_node_config_dir: "{{ openshift.common.config_base }}/node" -openshift_node_config_file: "{{ openshift_node_config_dir }}/node-config.yaml" |