1 files changed, 21 insertions, 28 deletions
diff --git a/roles/openshift_openstack/tasks/hostname.yml b/roles/openshift_openstack/tasks/hostname.yml
index 0fc8fbc4c..9815d0e80 100644
--- a/roles/openshift_openstack/tasks/hostname.yml
+++ b/roles/openshift_openstack/tasks/hostname.yml
@@ -1,33 +1,26 @@
 ---
-- name: "Verify hostname"
-  command: hostnamectl status --static
-  register: hostname_fqdn
+- name: Setting Hostname Fact
+  set_fact:
+    new_hostname: "{{ custom_hostname | default(inventory_hostname_short) }}"
 
-- name: "Set hostname if required"
-  when: hostname_fqdn.stdout != ansible_fqdn
-  block:
-  - name: Setting Hostname Fact
-    set_fact:
-      new_hostname: "{{ custom_hostname | default(inventory_hostname_short) }}"
+- name: Setting FQDN Fact
+  set_fact:
+    new_fqdn: "{{ new_hostname }}.{{ full_dns_domain }}"
 
-  - name: Setting FQDN Fact
-    set_fact:
-      new_fqdn: "{{ new_hostname }}.{{ full_dns_domain }}"
+- name: Setting hostname and DNS domain
+  hostname: name="{{ new_fqdn }}"
 
-  - name: Setting hostname and DNS domain
-    hostname: name="{{ new_fqdn }}"
+- name: Check for cloud.cfg
+  stat: path=/etc/cloud/cloud.cfg
+  register: cloud_cfg
 
-  - name: Check for cloud.cfg
-    stat: path=/etc/cloud/cloud.cfg
-    register: cloud_cfg
-
-  - name: Prevent cloud-init updates of hostname/fqdn (if applicable)
-    lineinfile:
-      dest: /etc/cloud/cloud.cfg
-      state: present
-      regexp: "{{ item.regexp }}"
-      line: "{{ item.line }}"
-    with_items:
-    - { regexp: '^ - set_hostname', line: '# - set_hostname' }
-    - { regexp: '^ - update_hostname', line: '# - update_hostname' }
-    when: cloud_cfg.stat.exists == True
+- name: Prevent cloud-init updates of hostname/fqdn (if applicable)
+  lineinfile:
+    dest: /etc/cloud/cloud.cfg
+    state: present
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  with_items:
+  - { regexp: '^ - set_hostname', line: '# - set_hostname' }
+  - { regexp: '^ - update_hostname', line: '# - update_hostname' }
+  when: cloud_cfg.stat.exists == True