Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit f27b0bc

Browse files
committed
Issue #1760: Make hostname role actually do what its docs say it does.
1 parent 5adbe28 commit f27b0bc

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

provisioning/roles/drupalvm.hostname/meta/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ galaxy_info:
1616
- all
1717
- name: Ubuntu
1818
versions:
19-
- precise
20-
- raring
21-
- saucy
22-
- trusty
23-
- xenial
19+
- all
2420

2521
galaxy_tags:
2622
- drupal

provisioning/roles/drupalvm.hostname/tasks/main.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
copy:
44
content: "{{ hostname_fqdn }}\n"
55
dest: /etc/mailname
6-
when: ansible_os_family == 'Debian'
6+
when:
7+
- ansible_os_family == 'Debian'
8+
- hostname_fqdn
79

810
- name: Add hostname to /etc/hosts.
911
lineinfile:
@@ -12,15 +14,19 @@
1214
line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
1315
state: present
1416
unsafe_writes: "{{ hostname_unsafe_writes }}"
17+
when: hostname_fqdn
1518

1619
- name: Configure hostname.
1720
copy:
1821
content: "{{ (ansible_os_family == 'Debian') | ternary(hostname_short, hostname_fqdn) }}\n"
1922
dest: /etc/hostname
2023
unsafe_writes: "{{ hostname_unsafe_writes }}"
2124
register: set_hostname
25+
when: hostname_fqdn
2226

2327
- name: Set the hostname for current session.
2428
command: hostname --file /etc/hostname
25-
when: set_hostname.changed
29+
when:
30+
- set_hostname is changed
31+
- hostname_fqdn
2632
tags: ['skip_ansible_lint']

0 commit comments

Comments
 (0)