openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Ansible 2.x - Address deprecation warning of bare variables"

Browse Source
This commit is contained in:
Jenkins 2016-04-21 07:53:18 +00:00 committed by Gerrit Code Review
commit a226a4d6a3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/main.yml
View File

@ -18,7 +18,7 @@
name: "{{ item }}" name: "{{ item }}"
state: restarted state: restarted
pattern: "{{ item }}" pattern: "{{ item }}"
with_items: cinder_service_names with_items: "{{ cinder_service_names }}"
failed_when: false failed_when: false
- name: Ensure tgt service restarted - name: Ensure tgt service restarted

2
tasks/cinder_backends.yml
View File

@ -31,7 +31,7 @@
{{ cinder_bin }}/cinder {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} type-create "{{ item.key }}" {{ cinder_bin }}/cinder {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} type-create "{{ item.key }}"
{{ cinder_bin }}/cinder {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} type-key "{{ item.key }}" set volume_backend_name="{{ item.value.volume_backend_name }}" {{ cinder_bin }}/cinder {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }} type-key "{{ item.key }}" set volume_backend_name="{{ item.value.volume_backend_name }}"
fi fi
with_dict: cinder_backends|default({}) with_dict: "{{ cinder_backends|default({}) }}"
tags: tags:
- cinder-backends - cinder-backends
- cinder-backends-types - cinder-backends-types

6
tasks/cinder_install.yml
View File

@ -73,7 +73,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: cinder_requires_pip_packages with_items: "{{ cinder_requires_pip_packages }}"
tags: tags:
- cinder-install - cinder-install
- cinder-pip-packages - cinder-pip-packages
@ -190,7 +190,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: cinder_pip_packages with_items: "{{ cinder_pip_packages }}"
when: when:
- cinder_venv_enabled | bool - cinder_venv_enabled | bool
- cinder_get_venv | failed or cinder_developer_mode | bool - cinder_get_venv | failed or cinder_developer_mode | bool
@ -208,7 +208,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: cinder_pip_packages with_items: "{{ cinder_pip_packages }}"
when: when:
- not cinder_developer_mode | bool - not cinder_developer_mode | bool
- not cinder_venv_enabled | bool - not cinder_venv_enabled | bool

4
tasks/cinder_install_apt.yml
View File

@ -34,7 +34,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: cinder_apt_packages with_items: "{{ cinder_apt_packages }}"
- name: Install apt packages - name: Install apt packages
apt: apt:
@ -44,7 +44,7 @@
until: install_packages|success until: install_packages|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: cinder_lvm_volume_apt_packages with_items: "{{ cinder_lvm_volume_apt_packages }}"
when: when:
- inventory_hostname in groups['cinder_volume'] - inventory_hostname in groups['cinder_volume']
- cinder_backend_lvm_inuse | bool - cinder_backend_lvm_inuse | bool