diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-08 15:18:53 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-09-08 15:52:57 -0400 |
| commit | f255cca0128d41b73eac8c11c2205ffe6ab07113 (patch) | |
| tree | 4dc1b994ba85f8db435515dbc24efcbf4243769c | |
| parent | 99e68454aa30bf3c80a584447617342a2c4470e2 (diff) | |
| download | openshift-f255cca0128d41b73eac8c11c2205ffe6ab07113.tar.gz openshift-f255cca0128d41b73eac8c11c2205ffe6ab07113.tar.bz2 openshift-f255cca0128d41b73eac8c11c2205ffe6ab07113.tar.xz openshift-f255cca0128d41b73eac8c11c2205ffe6ab07113.zip | |
Revert back to hostnamectl and previous default of not setting hostname
The old default was "{{ not openshift.common.version_gte_3_1_or_1_1 }}"
just default to false instead, master branch will never be used with 3.0
hostname module doesn't work on atomic host
Fixes BZ 1489913
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 7 |
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 |