diff options
| -rw-r--r-- | .ansible-lint | 2 | ||||
| -rw-r--r-- | ansible/certificates.yml | 3 | ||||
| -rw-r--r-- | ansible/kolla-host.yml | 3 | ||||
| -rw-r--r-- | ansible/migrate-container-engine.yml | 3 | ||||
| -rw-r--r-- | ansible/nova-libvirt-cleanup.yml | 3 | ||||
| -rw-r--r-- | ansible/prune-images.yml | 3 | ||||
| -rw-r--r-- | ansible/rabbitmq-upgrade.yml | 6 | ||||
| -rw-r--r-- | ansible/site.yml | 12 |
8 files changed, 22 insertions, 13 deletions
diff --git a/.ansible-lint b/.ansible-lint index 6122339fc..2f5285d8f 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -19,7 +19,5 @@ skip_list: - fqcn-builtins # FQCNs again, now for module actions - fqcn[action] - # TODO(frickler): Discuss these in detail, skipping for now to unblock things - - name[play] - var-naming[no-role-prefix] - yaml[line-length] diff --git a/ansible/certificates.yml b/ansible/certificates.yml index 772aa2f5c..decf2682b 100644 --- a/ansible/certificates.yml +++ b/ansible/certificates.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml when: >- kolla_enable_tls_backend | default(false) | bool or rabbitmq_enable_tls | default(false) | bool or diff --git a/ansible/kolla-host.yml b/ansible/kolla-host.yml index d50bd2f67..ea904c851 100644 --- a/ansible/kolla-host.yml +++ b/ansible/kolla-host.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml - name: Apply role baremetal hosts: baremetal diff --git a/ansible/migrate-container-engine.yml b/ansible/migrate-container-engine.yml index 4a3ccb55e..40dab0345 100644 --- a/ansible/migrate-container-engine.yml +++ b/ansible/migrate-container-engine.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml vars: kolla_action: migrate-container-engine diff --git a/ansible/nova-libvirt-cleanup.yml b/ansible/nova-libvirt-cleanup.yml index 5a69a8bfa..4ce377264 100644 --- a/ansible/nova-libvirt-cleanup.yml +++ b/ansible/nova-libvirt-cleanup.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml - name: Remove nova_libvirt container gather_facts: false diff --git a/ansible/prune-images.yml b/ansible/prune-images.yml index 20c1e1c0d..fac1dbcbb 100644 --- a/ansible/prune-images.yml +++ b/ansible/prune-images.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml - name: Apply role prune-images hosts: baremetal diff --git a/ansible/rabbitmq-upgrade.yml b/ansible/rabbitmq-upgrade.yml index 367767650..f53f5b28d 100644 --- a/ansible/rabbitmq-upgrade.yml +++ b/ansible/rabbitmq-upgrade.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml - name: Group hosts based on configuration (RabbitMQ Only) hosts: all @@ -15,7 +16,8 @@ changed_when: false tags: always -- import_playbook: rabbitmq.yml +- name: Run RabbitMQ upgrade + import_playbook: rabbitmq.yml vars: kolla_action: upgrade rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/rabbitmq-{{ rabbitmq_version_suffix | regex_replace('\\.', '-') }}" diff --git a/ansible/site.yml b/ansible/site.yml index 1a05fbc56..3d03d336f 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,5 +1,6 @@ --- -- import_playbook: gather-facts.yml +- name: Gather facts + import_playbook: gather-facts.yml # NOTE(mgoddard): In large environments, even tasks that are skipped can take a # significant amount of time. This is an optimisation to prevent any tasks @@ -427,7 +428,8 @@ # MariaDB deployment is more complicated than other services, so is covered in # its own playbook. -- import_playbook: mariadb.yml +- name: Apply role mariadb + import_playbook: mariadb.yml - name: Apply role memcached gather_facts: false @@ -503,7 +505,8 @@ roles: - { role: multipathd, tags: multipathd } -- import_playbook: rabbitmq.yml +- name: Apply role rabbitmq + import_playbook: rabbitmq.yml - name: Apply role etcd gather_facts: false @@ -659,7 +662,8 @@ # Nova deployment is more complicated than other services, so is covered in its # own playbook. -- import_playbook: nova.yml +- name: Apply role nova + import_playbook: nova.yml - name: Apply role neutron gather_facts: false |