From 0b4bbe59ef02a0c7c87180ae8da14bc349cc6ce6 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 8 Feb 2018 10:30:34 -0500 Subject: Restart systemd-hostnamed before restarting NetworkManager in node user-data. --- roles/openshift_aws/templates/user_data.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/openshift_aws/templates/user_data.j2 b/roles/openshift_aws/templates/user_data.j2 index bda1334cd..46e4e1cc5 100644 --- a/roles/openshift_aws/templates/user_data.j2 +++ b/roles/openshift_aws/templates/user_data.j2 @@ -20,6 +20,9 @@ runcmd: - [ ansible-playbook, /root/openshift_bootstrap/bootstrap.yml] {% endif %} {% if openshift_aws_node_group.group != 'master' %} +{# Restarting systemd-hostnamed ensures that instances will have FQDN +hostnames following network restart. #} +- [ systemctl, restart, systemd-hostnamed] - [ 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] -- cgit v1.2.3 From f8ca310090ef9d40dcfa14e1f6a2fd1b5490f38f Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Mon, 12 Feb 2018 10:24:21 -0500 Subject: Remove node start from bootstrap.yml. --- roles/openshift_node/files/bootstrap.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/openshift_node/files/bootstrap.yml b/roles/openshift_node/files/bootstrap.yml index a5545c81b..ea280640f 100644 --- a/roles/openshift_node/files/bootstrap.yml +++ b/roles/openshift_node/files/bootstrap.yml @@ -61,11 +61,3 @@ 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 -- cgit v1.2.3