Skip to content

Commit 2fcb7fa

Browse files
committed
Makefile: Remove "-f 30" command line argument
We can now set the maximum forks globally in ansible.cfg, and it can be adjusted with Kconfig or cli. Remove explicit fork settings from Makefiles. Suggested-by: Luis Chamberlain <[email protected]> Oh-hell-yeah: Luis Chamberlain <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 8c7c330 commit 2fcb7fa

File tree

21 files changed

+180
-102
lines changed

21 files changed

+180
-102
lines changed

scripts/firstconfig.Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
firstconfig:
44
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
5-
-f 30 -i hosts \
6-
--extra-vars '{ kdevops_cli_install: True }' \
5+
-i hosts --extra-vars '{ kdevops_cli_install: True }' \
76
--tags vars_simple,firstconfig \
87
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
98

scripts/iscsi.Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ ISCSI_EXTRA_ARGS += kdevops_enable_iscsi=true
66
ANSIBLE_EXTRA_ARGS += $(ISCSI_EXTRA_ARGS)
77

88
iscsi:
9-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
10-
-f 30 -i hosts -l iscsi playbooks/iscsi.yml
9+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
10+
-i $(KDEVOPS_HOSTFILE) -l iscsi \
11+
--extra-vars=@./extra_vars.yaml \
12+
$(KDEVOPS_PLAYBOOKS_DIR)/iscsi.yml
1113

1214
KDEVOPS_BRING_UP_DEPS += iscsi
1315

scripts/journal-server.Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ endif
1212

1313
journal-client:
1414
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
15-
-f 30 -i hosts \
16-
--extra-vars '{ kdevops_cli_install: True }' \
15+
-i hosts --extra-vars '{ kdevops_cli_install: True }' \
1716
--tags vars_simple,journal \
1817
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
1918

@@ -24,14 +23,12 @@ journal-server:
2423

2524
journal-restart:
2625
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
27-
-f 30 -i hosts \
28-
--tags vars_extra,journal-upload-restart \
26+
-i hosts --tags vars_extra,journal-upload-restart \
2927
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
3028

3129
journal-status:
3230
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
33-
-f 30 -i hosts \
34-
--tags vars_extra,journal-status \
31+
-i hosts --tags vars_extra,journal-status \
3532
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
3633

3734
journal-ls:
@@ -43,8 +40,7 @@ journal-dump:
4340

4441
journal-ln:
4542
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
46-
-f 30 -i hosts \
47-
--tags vars_extra,journal_ln \
43+
-i hosts --tags vars_extra,journal_ln \
4844
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
4945

5046
LOCALHOST_SETUP_WORK += journal-server

scripts/kotd.Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ ANSIBLE_CMD_KOTD_ENABLE :=
1111

1212
kotd: $(KDEVOPS_HOSTS) .config
1313
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
14-
-f 30 -i hosts playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
14+
-i hosts playbooks/devconfig.yml --tags vars,kotd \
15+
--extra-vars=@./extra_vars.yaml
1516

1617
kotd-baseline: $(KDEVOPS_HOSTS) .config
1718
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
18-
-f 30 -i hosts -l baseline playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
19+
-i hosts -l baseline playbooks/devconfig.yml --tags vars,kotd \
20+
--extra-vars=@./extra_vars.yaml
1921

2022
kotd-dev: $(KDEVOPS_HOSTS) .config
2123
$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
22-
-f 30 -i hosts -l dev playbooks/devconfig.yml --tags vars,kotd --extra-vars=@./extra_vars.yaml
24+
-i hosts -l dev playbooks/devconfig.yml --tags vars,kotd \
25+
--extra-vars=@./extra_vars.yaml
2326

2427
kotd-help-menu:
2528
@echo "kotd options:"

scripts/krb5.Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ KRB5_EXTRA_ARGS += kdevops_krb5_enable=True
77
ANSIBLE_EXTRA_ARGS += $(KRB5_EXTRA_ARGS)
88

99
kdc:
10-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
11-
-f 30 -i hosts -l kdc playbooks/kdc.yml
10+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
11+
-i $(KDEVOPS_HOSTFILE) -l kdc \
12+
--extra-vars=@./extra_vars.yaml \
13+
$(KDEVOPS_PLAYBOOKS_DIR)/kdc.yml
1214

1315
krb5:
14-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
15-
-f 30 -i hosts -l krb5 playbooks/krb5.yml
16+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
17+
-i $(KDEVOPS_HOSTFILE) -l krb5 \
18+
--extra-vars=@./extra_vars.yaml \
19+
$(KDEVOPS_PLAYBOOKS_DIR)/krb5.yml
1620

1721
KDEVOPS_BRING_UP_DEPS += kdc
1822
KDEVOPS_BRING_UP_LATE_DEPS += krb5

scripts/ktls.Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
22

33
ktls:
4-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
5-
-f 30 -i hosts playbooks/ktls.yml
4+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
5+
-i $(KDEVOPS_HOSTFILE) \
6+
--extra-vars=@./extra_vars.yaml \
7+
$(KDEVOPS_PLAYBOOKS_DIR)/ktls.yml
68

79
ktls-destroy:
810
$(Q)rm -rf $(TOPDIR)/ca

scripts/nfsd.Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ PHONY += extend-extra-args-nfsd
2828
ANSIBLE_EXTRA_ARGS += $(NFSD_EXTRA_ARGS)
2929

3030
nfsd:
31-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
32-
-f 30 -i hosts -l nfsd playbooks/nfsd.yml
31+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
32+
-i $(KDEVOPS_HOSTFILE) -l nfsd \
33+
--extra-vars=@./extra_vars.yaml \
34+
$(KDEVOPS_PLAYBOOKS_DIR)/nfsd.yml
3335

3436
KDEVOPS_BRING_UP_DEPS += nfsd
3537

scripts/rdma.Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW))
22

33
siw:
4-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
5-
-f 30 -i hosts playbooks/siw.yml
4+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
5+
-i $(KDEVOPS_HOSTFILE) \
6+
--extra-vars=@./extra_vars.yaml \
7+
$(KDEVOPS_PLAYBOOKS_DIR)/siw.yml
68

79
KDEVOPS_BRING_UP_DEPS += siw
810

@@ -13,8 +15,10 @@ endif
1315
ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_RXE))
1416

1517
rxe:
16-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
17-
-f 30 -i hosts playbooks/rxe.yml
18+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
19+
-i $(KDEVOPS_HOSTFILE) \
20+
--extra-vars=@./extra_vars.yaml \
21+
$(KDEVOPS_PLAYBOOKS_DIR)/rxe.yml
1822

1923
KDEVOPS_BRING_UP_DEPS += rxe
2024

scripts/smbd.Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ SMBD_EXTRA_ARGS += kdevops_smbd_enable=True
88
ANSIBLE_EXTRA_ARGS += $(SMBD_EXTRA_ARGS)
99

1010
smbd:
11-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \
12-
-f 30 -i hosts -l smbd playbooks/smbd.yml
11+
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
12+
-i $(KDEVOPS_HOSTFILE) -l smbd \
13+
--extra-vars=@./extra_vars.yaml \
14+
$(KDEVOPS_PLAYBOOKS_DIR)/smbd.yml
1315

1416
KDEVOPS_BRING_UP_DEPS += smbd
1517

scripts/systemd-timesync.Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ endif
2121

2222
timesyncd-client:
2323
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
24-
-f 30 -i hosts \
25-
--extra-vars '{ kdevops_cli_install: True }' \
24+
-i hosts --extra-vars '{ kdevops_cli_install: True }' \
2625
--tags vars_simple,timesyncd \
2726
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
2827

0 commit comments

Comments
 (0)