summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-16 01:37:30 -0800
committerGitHub <noreply@github.com>2017-11-16 01:37:30 -0800
commitc27a19e61a164969752445f436eadff990de5092 (patch)
treed3cccc704b34100f1010fe905041089484e9c2b6 /roles
parent4011df52c4ab9418a2261ce20f01c00c4e7a40b6 (diff)
parent9a0b659f990755ab1600606ed5513ac12d8daa40 (diff)
downloadopenshift-c27a19e61a164969752445f436eadff990de5092.tar.gz
openshift-c27a19e61a164969752445f436eadff990de5092.tar.bz2
openshift-c27a19e61a164969752445f436eadff990de5092.tar.xz
openshift-c27a19e61a164969752445f436eadff990de5092.zip
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.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_aws/templates/user_data.j21
-rw-r--r--roles/openshift_node/files/bootstrap.yml8
2 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_aws/templates/user_data.j2 b/roles/openshift_aws/templates/user_data.j2
index a8c7f9a95..fe0fe83d4 100644
--- a/roles/openshift_aws/templates/user_data.j2
+++ b/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 %}
diff --git a/roles/openshift_node/files/bootstrap.yml b/roles/openshift_node/files/bootstrap.yml
index ea280640f..a5545c81b 100644
--- a/roles/openshift_node/files/bootstrap.yml
+++ b/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