summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 09:12:08 -0800
committerGitHub <noreply@github.com>2018-02-12 09:12:08 -0800
commitf1263cb5edbe409fd044a37a395cc5b49e48dfeb (patch)
treefd56d30c6d4a255e2a5d1a1b24396bc143214fa1
parent848f3ea5c6f6adbf63a835880a72de47e387e771 (diff)
parentf8ca310090ef9d40dcfa14e1f6a2fd1b5490f38f (diff)
downloadopenshift-f1263cb5edbe409fd044a37a395cc5b49e48dfeb.tar.gz
openshift-f1263cb5edbe409fd044a37a395cc5b49e48dfeb.tar.bz2
openshift-f1263cb5edbe409fd044a37a395cc5b49e48dfeb.tar.xz
openshift-f1263cb5edbe409fd044a37a395cc5b49e48dfeb.zip
Merge pull request #7073 from abutcher/aws-node-hostname
Automatic merge from submit-queue. Update user-data for FQDN instance hostnames * Remove node service start from bootstrap.yml. We start and enable the node service in user-data and we want the node service to start after NetworkManager so that the instance will have its final hostname. * Restart systemd-hostnamed before restarting NetworkManager. In testing this has ensured that instances receive an FQDN hostname which is required for kube.
-rw-r--r--roles/openshift_aws/templates/user_data.j23
-rw-r--r--roles/openshift_node/files/bootstrap.yml8
2 files changed, 3 insertions, 8 deletions
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]
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