Merge "Fix ansible warning with jinja2 delimiters"

This commit is contained in:
Zuul 2018-02-08 20:25:43 +00:00 committed by Gerrit Code Review
commit ad1fc16b0c
3 changed files with 5 additions and 5 deletions

View File

@ -44,7 +44,7 @@
- name: Create additional blockdevice for objectstorage nodes
command: >
dd if=/dev/zero of={{ libvirt_volume_path }}/{{ item[0].name }}_{{ item[1] }}.img bs=1 count=0 seek={{ extradisks_size }}
when: "{{ flavors[item[0].flavor].extradisks | default(false) }}"
when: flavors[item[0].flavor].extradisks|default(false)
with_nested:
- "{{ overcloud_nodes }}"
- "{{ extradisks_list }}"
@ -52,7 +52,7 @@
- name: Check if additional blockdevices are attached
command: >
virsh domblkinfo {{ item[0].name }} {{ libvirt_volume_path }}/{{ item[0].name }}_{{ item[1] }}.img
when: "{{ flavors[item[0].flavor].extradisks | default(false) }}"
when: flavors[item[0].flavor].extradisks|default(false)
changed_when: false
ignore_errors: true
register: overcloud_extradisks_check

View File

@ -321,7 +321,7 @@
name: "{{ undercloud_node.name }}"
command: autostart
uri: "{{ libvirt_uri }}"
when: "{{ ansible_version.full | version_compare('2.3','<') }}"
when: ansible_version.full|version_compare('2.3','<')
# Start the undercloud virtual machine and make it
# automatically start for ansible-version >= 2.3
@ -332,7 +332,7 @@
autostart: true
state: running
uri: "{{ libvirt_uri }}"
when: "{{ ansible_version.full | version_compare('2.3','>=') }}"
when: ansible_version.full|version_compare('2.3','>=')
# Get the ip address of the undercloud. This will retry several times
# (`undercloud_ip_retries`) until the undercloud is ready. The script

View File

@ -32,7 +32,7 @@
- name: Set tuned profile if not already set
command: tuned-adm profile "{{ tuned_profile }}"
become: true
when: tuned.stdout.find("{{ tuned_profile }}") != 1
when: tuned.stdout.find(tuned_profile) != 1
# Create a non-root user on the target host. This is the user that
# will own the virtual infrastructure on which we deploy openstack.