summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-11 16:19:02 -0400
committerGitHub <noreply@github.com>2017-09-11 16:19:02 -0400
commit4acdef4af89bf2ccc43f9643a2e72a969d11ed04 (patch)
tree070376f1a58eb1e6d1c7cfd5a575bfdc97533886
parent7f6b76563c9fe6a96ea864c2dfea092e1f4805bc (diff)
parentf255cca0128d41b73eac8c11c2205ffe6ab07113 (diff)
downloadopenshift-4acdef4af89bf2ccc43f9643a2e72a969d11ed04.tar.gz
openshift-4acdef4af89bf2ccc43f9643a2e72a969d11ed04.tar.bz2
openshift-4acdef4af89bf2ccc43f9643a2e72a969d11ed04.tar.xz
openshift-4acdef4af89bf2ccc43f9643a2e72a969d11ed04.zip
Merge pull request #5340 from sdodson/bz1489913
Revert back to hostnamectl and previous default of not setting hostname
-rw-r--r--playbooks/common/openshift-cluster/config.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 3baa3c54d..bbd5a0185 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -25,10 +25,11 @@
- name: Set hostname
hosts: oo_masters_to_config:oo_nodes_to_config
tasks:
+ # TODO: switch back to hostname module once we depend on ansible-2.4
+ # https://github.com/ansible/ansible/pull/25906
- name: Set hostname
- hostname:
- name: "{{ openshift.common.hostname }}"
- when: openshift_set_hostname | default(True) | bool
+ command: "hostnamectl set-hostname {{ openshift.common.hostname }}"
+ when: openshift_set_hostname | default(false,true) | bool
- include: ../openshift-etcd/config.yml