Merge pull request #2 from sdodson/systemd-units-node-config

Get rid of openshift_node_config_file entirely

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

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:

roles/openshift_node/vars/main.yml

@@ -1,3 +0,0 @@
----
-openshift_node_config_dir: "{{ openshift.common.config_base }}/node"
-openshift_node_config_file: "{{ openshift_node_config_dir }}/node-config.yaml"