Skip to content

Commit dccd390

Browse files
committed
use iam.yml in fatimage
1 parent 1a744b8 commit dccd390

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

ansible/fatimage.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,12 @@
2525
import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
2626
when: hook_path | exists
2727

28+
- import_playbook: iam.yml
29+
2830
- hosts: builder
2931
become: yes
3032
gather_facts: yes
3133
tasks:
32-
# - import_playbook: iam.yml
33-
- name: Install FreeIPA client
34-
import_role:
35-
name: freeipa
36-
tasks_from: client-install.yml
37-
when: "'freeipa_client' in group_names"
38-
- name: Install sssd
39-
import_role:
40-
name: sssd
41-
tasks_from: install.yml
42-
when: "'sssd' in group_names"
43-
4434
# - import_playbook: filesystems.yml:
4535
- name: Install nfs packages
4636
dnf:

ansible/iam.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- hosts: freeipa_client
1+
- hosts: freeipa_client:!builder
22
tags:
33
- freeipa
44
- freeipa_server # as this is only relevant if using freeipa_server
@@ -23,12 +23,20 @@
2323
import_role:
2424
name: freeipa
2525
tasks_from: client-install.yml
26+
27+
- hosts: freeipa_client:!builder
28+
tags:
29+
- freeipa
30+
- freeipa_client
31+
gather_facts: yes
32+
become: yes
33+
tasks:
2634
- name: Enrol FreeIPA client
2735
import_role:
2836
name: freeipa
2937
tasks_from: enrol.yml
3038

31-
- hosts: freeipa_server
39+
- hosts: freeipa_server:!builder
3240
tags:
3341
- freeipa
3442
- freeipa_server
@@ -49,3 +57,4 @@
4957
- name: Configure sssd
5058
import_role:
5159
name: sssd
60+
tasks_from: "{{ 'install.yml' if appliances_mode == 'build' else 'main.yml' }}"

0 commit comments

Comments
 (0)