Skip to content

Commit 43c3880

Browse files
authored
Merge pull request #220 from Icinga/fix/director-installation
Fix/director installation
2 parents fc5062b + bd9dea3 commit 43c3880

File tree

2 files changed

+36
-9
lines changed

2 files changed

+36
-9
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
minor_change:
3+
- Adjusted the installation of the director module when using the source installation.

roles/icingaweb2/tasks/modules/director.yml

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
- name: Module Director | Ensure config directory
23
ansible.builtin.file:
34
state: directory
@@ -18,34 +19,57 @@
1819
- kickstart
1920
- config
2021

21-
- name: Module Director | Check for pending migrations
22+
- name: Module Director | Check for pending migrations # noqa: command-instead-of-shell
2223
ansible.builtin.shell:
2324
cmd: icingacli director migration pending
2425
register: _pending
2526
changed_when: _pending.rc|int == 0
2627
failed_when: _pending.stdout|length > 0
2728
when: vars['icingaweb2_modules']['director']['import_schema'] is defined and vars['icingaweb2_modules']['director']['import_schema'] and vars['icingaweb2_modules']['director']['config'] is defined
2829

29-
- name: Module Director | Apply pending migrations
30+
- name: Module Director | Apply pending migrations # noqa: command-instead-of-shell
3031
ansible.builtin.shell:
3132
cmd: icingacli director migration run
3233
when: vars['icingaweb2_modules']['director']['import_schema'] is defined and vars['icingaweb2_modules']['director']['import_schema'] and vars['icingaweb2_modules']['director']['config'] is defined and _pending.rc|int == 0
3334

34-
- name: Module Director | Check if kickstart is required
35+
- name: Module Director | Check if kickstart is required # noqa: command-instead-of-shell
3536
ansible.builtin.shell:
3637
cmd: icingacli director kickstart required
3738
register: _required
3839
changed_when: _required.rc|int == 0
3940
failed_when: _required.rc|int >= 2
4041
when: vars['icingaweb2_modules']['director']['run_kickstart'] is defined and vars['icingaweb2_modules']['director']['run_kickstart'] and vars['icingaweb2_modules']['director']['kickstart'] is defined
4142

42-
- name: Module Director | Check if kickstart is required
43+
- name: Module Director | Check if kickstart is required # noqa: command-instead-of-shell
4344
ansible.builtin.shell:
4445
cmd: icingacli director kickstart run
4546
when: vars['icingaweb2_modules']['director']['run_kickstart'] is defined and vars['icingaweb2_modules']['director']['run_kickstart'] and vars['icingaweb2_modules']['director']['kickstart'] is defined and _required.rc|int == 0
4647

47-
- name: Module Director | Ensure daemon is running
48-
ansible.builtin.service:
49-
name: "{{ icingaweb2_director_service }}"
50-
state: started
51-
enabled: yes
48+
- name: Module Director | Ensure installation from source is complete
49+
when: icingaweb2_modules['director']['source'] == 'git'
50+
block:
51+
- name: Module Director | Ensure daemon user exists
52+
ansible.builtin.user:
53+
name: icingadirector
54+
state: present
55+
shell: /bin/nologin
56+
system: yes
57+
home: /var/lib/icingadirector
58+
group: "{{ icingaweb2_group }}"
59+
60+
- name: Module Director | Ensure home directory exists
61+
ansible.builtin.file:
62+
state: directory
63+
dest: /var/lib/icingadirector
64+
owner: icingadirector
65+
group: "{{ icingaweb2_group }}"
66+
mode: "0750"
67+
68+
- name: Module Director | Ensure systemd unit file exists
69+
ansible.builtin.copy:
70+
src: "{{ icingaweb2_config.global.module_path }}/director/contrib/systemd/icinga-director.service"
71+
dest: /etc/systemd/system/icingadirector.service
72+
owner: root
73+
group: root
74+
mode: "0644"
75+
remote_src: yes

0 commit comments

Comments
 (0)