Skip to content

Commit 3b9eb46

Browse files
committed
fixup resolv_conf support in cloud-init
1 parent cdbf005 commit 3b9eb46

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ansible/roles/compute_init/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ The following roles/groups are currently fully functional:
3636
- `etc_hosts`: all functionality
3737
- `nfs`: client functionality only
3838
- `manila`: all functionality
39-
- `openhpc`: all functionality
4039
- `basic_users`: all functionality, assumes home directory already exists on
4140
shared storage
4241
- `eessi`: all functionality, assumes `cvmfs_config` is the same on control
4342
node and all compute nodes.
43+
- `openhpc`: all functionality
4444

4545
# Development/debugging
4646

ansible/roles/compute_init/files/compute-init.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@
9494
block:
9595
- name: Set nameservers in /etc/resolv.conf
9696
ansible.builtin.template:
97-
src: /etc/ansible-init/templates/resolv.conf.j2
97+
src: resolv.conf.j2
9898
dest: /etc/resolv.conf
9999
owner: root
100100
group: root
101101
mode: u=rw,og=r
102102

103103
- name: Disable NetworkManager control of resolv.conf
104104
ansible.builtin.copy:
105-
src: /etc/ansible-init/files/NetworkManager-dns-none.conf
105+
src: files/NetworkManager-dns-none.conf
106106
dest: /etc/NetworkManager/conf.d/90-dns-none.conf
107107
owner: root
108108
group: root

0 commit comments

Comments
 (0)