diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-10-17 16:09:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 16:09:27 -0400 |
| commit | 991cb8d7333e109d1ec30b47b324ef5dd8edb098 (patch) | |
| tree | 45a9c496ef22060bd535ca1adabd45691ae8ad87 | |
| parent | b113727da29601982bcd6d52223e67e2a1ec3f44 (diff) | |
| parent | 6217d75e1030aef6f40ab127cf9ccf753e6620d5 (diff) | |
| download | openshift-991cb8d7333e109d1ec30b47b324ef5dd8edb098.tar.gz openshift-991cb8d7333e109d1ec30b47b324ef5dd8edb098.tar.bz2 openshift-991cb8d7333e109d1ec30b47b324ef5dd8edb098.tar.xz openshift-991cb8d7333e109d1ec30b47b324ef5dd8edb098.zip | |
Merge pull request #2 from sdodson/systemd-units-node-config
Get rid of openshift_node_config_file entirely
| -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 b6dcdc934..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.common.config_base }}/node/node-config.yaml }}" + 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" |