Skip to content

Commit 93b4ec7

Browse files
committed
prefix variables with role name
1 parent c892d75 commit 93b4ec7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

roles/cvmfs_server_meta_info/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
cvmfs_server_meta:
2+
cvmfs_server_meta_info_server:
33
administrator: "{{ cvmfs_server_meta_administrator | default('Your Name') }}"
44
email: "{{ cvmfs_server_meta_email | default('[email protected]') }}"
55
organisation: "{{ cvmfs_server_meta_organisation | default('Your Organisation') }}"
66
custom: "{{ cvmfs_server_meta_custom | default({'_comment': 'Put arbitrary structured data here'}) }}"
77

8-
cvmfs_repo_meta:
8+
cvmfs_server_meta_info_repo:
99
administrator: "{{ cvmfs_server_meta_administrator | default('Your Name') }}"
1010
email: "{{ cvmfs_server_meta_email | default('[email protected]') }}"
1111
organisation: "{{ cvmfs_server_meta_organisation | default('Your Organisation') }}"

roles/cvmfs_server_meta_info/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
- name: Create a meta.json containing the CVMFS Server Meta Information
33
ansible.builtin.copy:
4-
content: "{{ cvmfs_server_meta | to_nice_json(indent=2, sort_keys=false) }}"
4+
content: "{{ cvmfs_server_meta_info_server | to_nice_json(indent=2, sort_keys=false) }}"
55
dest: "{{ cvmfs_srv_mount }}/cvmfs/info/v1/meta.json"
66
owner: root
77
group: root
8-
mode: 0644
8+
mode: "0644"
99
become: true
1010
when: (cvmfs_repositories | length) > 0
1111

roles/cvmfs_server_meta_info/tasks/repo_meta_info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
- name: Add meta information for repository to temporary json file
99
ansible.builtin.copy:
10-
content: "{{ cvmfs_repo_meta | combine(this_cvmfs_repo_meta) | to_nice_json(indent=2, sort_keys=false) }}"
10+
content: "{{ cvmfs_server_meta_info_repo | combine(this_cvmfs_repo_meta) | to_nice_json(indent=2, sort_keys=false) }}"
1111
dest: "{{ tmp_json_file.path }}"
1212
mode: 0644
1313

0 commit comments

Comments
 (0)