base: skip role incompatible with kubectl connection

This change updates the base playbook to be compatible with
kubectl connection.

Depends-On: https://review.opendev.org/680712
Change-Id: I6debcab71e7fc9cd17a5600ad8d8fb4ec50aeb10
This commit is contained in:
Tristan Cacqueray 2020-03-31 13:43:24 +00:00
parent a9f6ab15e3
commit 548064a65e
3 changed files with 40 additions and 12 deletions

View File

@ -1,3 +1,5 @@
- hosts: all
roles:
- remove-build-sshkey
tasks:
- include_role:
name: remove-build-sshkey
when: ansible_connection != "kubectl"

View File

@ -1,3 +1,9 @@
- hosts: all
roles:
- fetch-output
tasks:
- include_role:
name: fetch-output
when: ansible_connection != "kubectl"
- include_role:
name: fetch-output-openshift
when: ansible_connection == "kubectl"

View File

@ -1,13 +1,33 @@
- hosts: all
roles:
- add-build-sshkey
- prepare-workspace
# This role ensures basic connectivity and produces some
# helpful information in zuul-info/
- validate-host
tasks:
- include_role:
name: start-zuul-console
# This block is for ssh connection
- block:
- include_role:
name: add-build-sshkey
- include_role:
name: prepare-workspace
# This role ensures basic connectivity and produces some
# helpful information in zuul-info/
- include_role:
name: validate-host
when: ansible_connection != "kubectl"
# This block is for kubectl connection
- block:
- include_role:
name: remove-zuul-sshkey
- include_role:
name: prepare-workspace-openshift
when: ansible_connection == "kubectl"
# This role ensures standard output directories are created
# on each remote node
- ensure-output-dirs
- include_role:
name: ensure-output-dirs
# This roles copies the ansible inventory to zuul-info/
# for debugging purposes
- log-inventory
- include_role:
name: log-inventory