Name plays in playbooks

In run_all, we start a bunch of plays in sequence, but it's difficult
to tell what they're doing until you see the tasks.  Name the plays
themselves to produce a better narrative structure.

Change-Id: I0597eab2c06c6963601dec689714c38101a4d470
This commit is contained in:
James E. Blair 2018-09-07 10:51:56 -07:00
parent b8faefa8a8
commit 2eee43e627
8 changed files with 17 additions and 8 deletions

View File

@ -1,4 +1,5 @@
- hosts: "!disabled" - hosts: "!disabled"
name: "Base: set up users and base package repositories on all hosts"
roles: roles:
- users - users
- base-repos - base-repos
@ -6,12 +7,14 @@
# Run base-server seperately so that the update apt cache handler in base-repos # Run base-server seperately so that the update apt cache handler in base-repos
# fires before we run base-server # fires before we run base-server
- hosts: "!disabled" - hosts: "!disabled"
name: "Base: set up common environment on all hosts"
roles: roles:
- base-server - base-server
- timezone - timezone
- unbound - unbound
- hosts: bridge.openstack.org:!disabled - hosts: bridge.openstack.org:!disabled
name: "Base: configure OpenStackSDK on bridge"
tasks: tasks:
- include_role: - include_role:
name: configure-openstacksdk name: configure-openstacksdk
@ -24,17 +27,20 @@
openstacksdk_config_template: clouds/bridge_clouds.yaml.j2 openstacksdk_config_template: clouds/bridge_clouds.yaml.j2
- hosts: nodepool-launcher:nodepool-builder:!disabled - hosts: nodepool-launcher:nodepool-builder:!disabled
name: "Base: configure OpenStackSDK on nodepool"
strategy: free strategy: free
roles: roles:
- minimal-nodepool - minimal-nodepool
- configure-openstacksdk - configure-openstacksdk
- hosts: "puppet:!disabled" - hosts: "puppet:!disabled"
name: "Base: install and configure puppet on puppet hosts"
roles: roles:
- puppet-install - puppet-install
- disable-puppet-agent - disable-puppet-agent
- hosts: "!ci-backup:!disabled" - hosts: "!ci-backup:!disabled"
name: "Base: set up common environment on all hosts (except backup)"
roles: roles:
- exim - exim
- iptables - iptables

View File

@ -1,4 +1,5 @@
- hosts: bridge.openstack.org - hosts: bridge.openstack.org
name: "Bridge: configure the bastion host"
become: true become: true
roles: roles:
- pip3 - pip3

View File

@ -1,4 +1,5 @@
- hosts: "afs:afsdb:!disabled" - hosts: "afs:afsdb:!disabled"
name: "AFS: run puppet on the AFS servers"
strategy: free strategy: free
roles: roles:
- puppet - puppet

View File

@ -1,4 +1,5 @@
- hosts: 'puppet:!review:!git-server:!zuul-scheduler:!afs:!afsdb:!puppetmaster*:!disabled' - hosts: 'puppet:!review:!git-server:!zuul-scheduler:!afs:!afsdb:!puppetmaster*:!disabled'
name: "Puppet-else: run puppet on all other servers"
strategy: free strategy: free
roles: roles:
- puppet - puppet

View File

@ -1,8 +1,8 @@
- hosts: "localhost:!disabled" - hosts: "localhost:!disabled"
name: "Puppet-git: Collect the project-config ref"
strategy: free strategy: free
connection: local connection: local
tasks: tasks:
# Note that git module does ls-remote if clone is set to no and places # Note that git module does ls-remote if clone is set to no and places
# the remote_head value in returndict.after # the remote_head value in returndict.after
- name: Grab project-config repo info - name: Grab project-config repo info
@ -12,29 +12,29 @@
register: gitinfo register: gitinfo
- hosts: "git-server:!disabled" - hosts: "git-server:!disabled"
name: "Puppet-git: Run puppet on the git servers"
strategy: free strategy: free
max_fail_percentage: 1 max_fail_percentage: 1
roles: roles:
- role: puppet - role: puppet
facts: facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
- hosts: "review:!disabled" - hosts: "review:!disabled"
name: "Puppet-git: Run puppet on the Gerrit server"
strategy: free strategy: free
gather_facts: true gather_facts: true
roles: roles:
- role: puppet - role: puppet
facts: facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
puppet_timeout: 60m puppet_timeout: 60m
- hosts: "zuul-scheduler:!disabled" - hosts: "zuul-scheduler:!disabled"
name: "Puppet-git: Run puppet on the Zuul scheduler"
strategy: free strategy: free
gather_facts: true gather_facts: true
roles: roles:
- role: puppet - role: puppet
facts: facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"

View File

@ -1,6 +1,6 @@
---
- hosts: localhost - hosts: localhost
name: "Cloud-launcher: Run cloud launcher"
connection: local connection: local
gather_facts: false gather_facts: false
roles: roles:
- { role: cloud-launcher } - cloud-launcher

View File

@ -1,9 +1,8 @@
---
- hosts: "localhost:!disabled" - hosts: "localhost:!disabled"
name: "System-config: Update the system-config repo on bridge"
connection: local connection: local
gather_facts: false gather_facts: false
tasks: tasks:
- name: Make sure system-config repo is up to date - name: Make sure system-config repo is up to date
git: git:
repo: https://git.openstack.org/openstack-infra/system-config repo: https://git.openstack.org/openstack-infra/system-config

View File

@ -1,4 +1,5 @@
- hosts: 'puppet4' - hosts: 'puppet4'
name: "Puppet-version: install puppet-4 on puppet-4 hosts"
gather_facts: false gather_facts: false
tasks: tasks:
- git: - git: