Merge pull request #5990 from kwoodson/ensure_node_started

Automatic merge from submit-queue.

Ensure node service is started.

When bootstrapping nodes we need to restart networkmanager so that the /etc/resolv.conf is properly populated.  We also restart the node service after making changes to the unit files.

roles/openshift_aws/templates/user_data.j2

@@ -20,6 +20,7 @@ runcmd:
 - [ ansible-playbook, /root/openshift_bootstrap/bootstrap.yml]
 {%     endif %}
 {%     if launch_config_item.key != 'master' %}
+- [ systemctl, restart, NetworkManager]
 - [ systemctl, enable, {% if openshift_deployment_type == 'openshift-enterprise' %}atomic-openshift{% else %}origin{% endif %}-node]
 - [ systemctl, start, {% if openshift_deployment_type == 'openshift-enterprise' %}atomic-openshift{% else %}origin{% endif %}-node]
 {%     endif %}

roles/openshift_node/files/bootstrap.yml

@@ -61,3 +61,11 @@
       with_items:
       - line: "BOOTSTRAP_CONFIG_NAME=node-config-{{ openshift_group_type }}"
         regexp: "^BOOTSTRAP_CONFIG_NAME=.*"
+
+    - name: "Start the {{ openshift_service_type }}-node service"
+      systemd:
+        daemon_reload: yes
+        state: restarted
+        enabled: True
+        name: "{{ openshift_service_type }}-node"
+        no_block: true