Skip to content

Commit 20cc559

Browse files
committed
This removes the need for -i everywhere
1 parent bf0c05c commit 20cc559

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

provision-contest/ansible/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@ endif
3434

3535
ROLES=domserver judgehost admin grafana cds presclient presadmin scoreboard mgmt autoanalyst
3636
$(ROLES): %: %.yml hosts group_vars/all/secret.yml $(VENDOR) $(SSHKEY) $(SSHKEY).pub
37-
ansible-playbook -i hosts $<
37+
ansible-playbook $<
3838

3939
FAILED_ROLES=$(addprefix failed-,$(ROLES))
4040
$(FAILED_ROLES): failed-%: %.yml %.retry
41-
ansible-playbook -i hosts --limit @$*.retry $<
41+
ansible-playbook --limit @$*.retry $<
4242

4343
CODEONLY_ROLES=$(addprefix codeonly-,domserver judgehost admin)
4444
$(CODEONLY_ROLES): codeonly-%:
45-
ansible-playbook -i hosts --tags pretask,domjudge_build $*.yml
45+
ansible-playbook --tags pretask,domjudge_build $*.yml
4646

4747
powerloss:
48-
ansible-playbook -i hosts emergency.yml --tags powerloss
48+
ansible-playbook emergency.yml --tags powerloss
4949

5050
lockdown:
51-
ansible-playbook -i hosts emergency.yml --tags full_lockdown
51+
ansible-playbook emergency.yml --tags full_lockdown
5252

5353
lockdown-force:
54-
ansible-playbook -i hosts emergency.yml --tags full_lockdown,force_lockdown
54+
ansible-playbook emergency.yml --tags full_lockdown,force_lockdown
5555

5656
ansible-master:
5757
for book in $(ROLES) ; do \
58-
ansible-playbook -i hosts $$book.yml --tags install_master ; \
58+
ansible-playbook $$book.yml --tags install_master ; \
5959
done
6060

6161
admin: $(SSL_LOCALHOST_FILES)

provision-contest/ansible/ansible.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ system_warnings = True
55
strategy = free
66
retry_files_enabled = True
77
retry_files_save_path = ~/.ansible-retry
8+
inventory = hosts
89

910
[connection]
1011
ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s

0 commit comments

Comments
 (0)