openstack/kolla-ansible
Code Issues Proposed changes

Merge "Clean up the unnecessary "" for include_tasks"

Browse Source
This commit is contained in:
Zuul 2020-06-17 20:27:49 +00:00 committed by Gerrit Code Review
commit e2acee87ee
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/horizon/tasks/reconfigure.yml
View File

@ -1,2 +1,2 @@
--- ---
- include_tasks: "deploy.yml" - include_tasks: deploy.yml

2
ansible/roles/mongodb/handlers/main.yml
View File

@ -31,5 +31,5 @@
run_once: True run_once: True
- name: Bootstrap cluster - name: Bootstrap cluster
include_tasks: "bootstrap_cluster.yml" include_tasks: bootstrap_cluster.yml
when: mongodb_replication_status.stdout != "1" when: mongodb_replication_status.stdout != "1"

4
ansible/roles/nova-cell/tasks/config.yml
View File

@ -92,7 +92,7 @@
- Restart nova-libvirt container - Restart nova-libvirt container
- name: Copying over libvirt TLS keys (nova-libvirt) - name: Copying over libvirt TLS keys (nova-libvirt)
include_tasks: "config-libvirt-tls.yml" include_tasks: config-libvirt-tls.yml
vars: vars:
service: "{{ nova_cell_services['nova-libvirt'] }}" service: "{{ nova_cell_services['nova-libvirt'] }}"
service_name: nova-libvirt service_name: nova-libvirt
@ -110,7 +110,7 @@
- clientkey.pem - clientkey.pem
- name: Copying over libvirt TLS keys (nova-compute) - name: Copying over libvirt TLS keys (nova-compute)
include_tasks: "config-libvirt-tls.yml" include_tasks: config-libvirt-tls.yml
vars: vars:
service: "{{ nova_cell_services['nova-compute'] }}" service: "{{ nova_cell_services['nova-compute'] }}"
service_name: nova-compute service_name: nova-compute

2
ansible/roles/nova-hyperv/tasks/reconfigure.yml
View File

@ -1,2 +1,2 @@
--- ---
- include_tasks: "deploy.yml" - include_tasks: deploy.yml

6
ansible/roles/octavia/tasks/deploy.yml
View File

@ -1,14 +1,14 @@
--- ---
- include_tasks: "register.yml" - include_tasks: register.yml
when: inventory_hostname in groups['octavia-api'] when: inventory_hostname in groups['octavia-api']
- include_tasks: "config.yml" - include_tasks: config.yml
when: inventory_hostname in groups['octavia-api'] or when: inventory_hostname in groups['octavia-api'] or
inventory_hostname in groups['octavia-health-manager'] or inventory_hostname in groups['octavia-health-manager'] or
inventory_hostname in groups['octavia-housekeeping'] or inventory_hostname in groups['octavia-housekeeping'] or
inventory_hostname in groups['octavia-worker'] inventory_hostname in groups['octavia-worker']
- include_tasks: "bootstrap.yml" - include_tasks: bootstrap.yml
when: inventory_hostname in groups['octavia-api'] when: inventory_hostname in groups['octavia-api']
- name: Flush handlers - name: Flush handlers

4
ansible/roles/octavia/tasks/upgrade.yml
View File

@ -1,7 +1,7 @@
--- ---
- include_tasks: "config.yml" - include_tasks: config.yml
- include_tasks: "bootstrap_service.yml" - include_tasks: bootstrap_service.yml
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers

2
ansible/roles/redis/tasks/reconfigure.yml
View File

@ -1,2 +1,2 @@
--- ---
- include_tasks: "deploy.yml" - include_tasks: deploy.yml

2
ansible/roles/skydive/tasks/reconfigure.yml
View File

@ -1,2 +1,2 @@
--- ---
- include_tasks: "deploy.yml" - include_tasks: deploy.yml