openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Switch include to include_tasks or import_playbook"

Browse Source
This commit is contained in:
Zuul 2018-10-11 02:15:53 +00:00 committed by Gerrit Code Review
commit 8f75e8fc1d
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/cinder_backends.yml
View File

@ -62,8 +62,7 @@
with_dict: "{{ _cinder_backends|default({}) }}" with_dict: "{{ _cinder_backends|default({}) }}"
when: item.value.extra_volume_types is defined when: item.value.extra_volume_types is defined
- include: cinder_qos.yml - include_tasks: cinder_qos.yml
static: no
when: cinder_qos_specs is defined when: cinder_qos_specs is defined
tags: tags:
- cinder-qos - cinder-qos

19
tasks/main.yml
View File

@ -47,11 +47,11 @@
tags: tags:
- cinder-config - cinder-config
- include: cinder_pre_install.yml - include_tasks: cinder_pre_install.yml
tags: tags:
- cinder-install - cinder-install
- include: cinder_install.yml - include_tasks: cinder_install.yml
tags: tags:
- cinder-install - cinder-install
@ -62,13 +62,13 @@
tags: tags:
- cinder-config - cinder-config
- include: cinder_cleanup_old_facts.yml - include_tasks: cinder_cleanup_old_facts.yml
when: when:
- "'need_db_sync' in ansible_local['openstack_ansible']['cinder']" - "'need_db_sync' in ansible_local['openstack_ansible']['cinder']"
tags: tags:
- cinder-config - cinder-config
- include: cinder_post_install.yml - include_tasks: cinder_post_install.yml
tags: tags:
- cinder-config - cinder-config
@ -113,8 +113,7 @@
- common-mq - common-mq
- cinder-config - cinder-config
- include: cinder_db_setup.yml - include_tasks: cinder_db_setup.yml
static: no
when: when:
- "groups['cinder_api'] | length > 0" - "groups['cinder_api'] | length > 0"
- "cinder_services['cinder-api']['group'] in group_names" - "cinder_services['cinder-api']['group'] in group_names"
@ -122,12 +121,11 @@
tags: tags:
- cinder-config - cinder-config
- include: cinder_uwsgi.yml - include_tasks: cinder_uwsgi.yml
tags: tags:
- cinder-config - cinder-config
- include: cinder_service_setup.yml - include_tasks: cinder_service_setup.yml
static: no
when: when:
- "groups['cinder_api'] | length > 0" - "groups['cinder_api'] | length > 0"
- "cinder_services['cinder-api']['group'] in group_names" - "cinder_services['cinder-api']['group'] in group_names"
@ -150,8 +148,7 @@
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
- include: cinder_backends.yml - include_tasks: cinder_backends.yml
static: no
when: when:
- "groups[cinder_services['cinder-volume']['group']] | length > 0" - "groups[cinder_services['cinder-volume']['group']] | length > 0"
- "cinder_services['cinder-api']['group'] in group_names" - "cinder_services['cinder-api']['group'] in group_names"

12
tests/test.yml
View File

@ -14,19 +14,19 @@
# limitations under the License. # limitations under the License.
# Setup the host # Setup the host
- include: common/test-setup-host.yml - import_playbook: common/test-setup-host.yml
# Prepare the cinder-volumes VG # Prepare the cinder-volumes VG
- include: common/test-setup-cinder-localhost.yml - import_playbook: common/test-setup-cinder-localhost.yml
# Install RabbitMQ/MariaDB # Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml - import_playbook: common/test-install-infra.yml
# Install Keystone # Install Keystone
- include: common/test-install-keystone.yml - import_playbook: common/test-install-keystone.yml
# Install Cinder # Install Cinder
- include: common/test-install-cinder.yml - import_playbook: common/test-install-cinder.yml
# Install and execute Tempest # Install and execute Tempest
- include: common/test-install-tempest.yml - import_playbook: common/test-install-tempest.yml