From 138a0302baff4553bdcf320587a489545ad52016 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 4 Nov 2022 09:17:48 +1100 Subject: [PATCH] run-production-bootstrap-bridge: use add-bastion-host This playbook can use the add-bastion-host role to add the bastion host. This is one less place the bridge name is hard-coded. Change-Id: I5ad7f6f1ac9bdf9af59b835d8fd466c3ca276639 --- .../zuul/run-production-bootstrap-bridge.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/playbooks/zuul/run-production-bootstrap-bridge.yaml b/playbooks/zuul/run-production-bootstrap-bridge.yaml index ec31352bea..e833fc4514 100644 --- a/playbooks/zuul/run-production-bootstrap-bridge.yaml +++ b/playbooks/zuul/run-production-bootstrap-bridge.yaml @@ -1,17 +1,5 @@ - hosts: localhost - tasks: - - name: Add bridge.o.o to inventory for playbook - add_host: - name: bridge01.opendev.org - groups: 'bastion' - ansible_python_interpreter: python3 - ansible_user: zuul - # Without setting ansible_host directly, mirror-workspace-git-repos - # gets sad because if delegate_to localhost and with add_host that - # ends up with ansible_host being localhost. - ansible_host: bridge01.opendev.org - ansible_port: 22 - # Port 19885 is firewalled - zuul_console_disabled: true + roles: + - add-bastion-host - import_playbook: ../bootstrap-bridge.yaml