Skip to content
Snippets Groups Projects
Commit c88b9eb4 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Clean some Boolean condition checks"

parents 5320e5ea 8b5b3cef
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
package: name={{item}} state=absent package: name={{item}} state=absent
with_items: "{{ ubuntu_pkg_removals }}" with_items: "{{ ubuntu_pkg_removals }}"
become: True become: True
when: ansible_distribution|lower == "ubuntu" | bool when: ansible_distribution|lower == "ubuntu"
- name: Remove packages - name: Remove packages
package: name={{item}} state=absent package: name={{item}} state=absent
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
become: True become: True
when: when:
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- apparmor_libvirtd_profile.stat.exists | bool - apparmor_libvirtd_profile.stat.exists
- name: Create docker group - name: Create docker group
group: group:
......
...@@ -141,4 +141,4 @@ ...@@ -141,4 +141,4 @@
recurse: yes recurse: yes
mode: 0644 mode: 0644
become: True become: True
when: create_kolla_user | bool == False when: not create_kolla_user | bool
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml) ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml)
with_items: "{{ osds_bootstrap|default([]) }}" with_items: "{{ osds_bootstrap|default([]) }}"
when: when:
- item.external_journal | bool == False - not item.external_journal | bool
- item.device.split('/')[2] in ansible_devices # if there is no device in setup (like loopback, we don't need to warn user - item.device.split('/')[2] in ansible_devices # if there is no device in setup (like loopback, we don't need to warn user
- ansible_devices[item.device.split('/')[2]].partitions|count > 1 - ansible_devices[item.device.split('/')[2]].partitions|count > 1
- ceph_osd_wipe_disk != "yes-i-really-really-mean-it" - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml) ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml)
with_items: "{{ osds_cache_bootstrap|default([]) }}" with_items: "{{ osds_cache_bootstrap|default([]) }}"
when: when:
- item.external_journal | bool == False - not item.external_journal | bool
- ansible_devices[item.device.split('/')[2]].partitions|count > 1 - ansible_devices[item.device.split('/')[2]].partitions|count > 1
- ceph_osd_wipe_disk != "yes-i-really-really-mean-it" - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
enabled: true enabled: true
- name: "01-es" - name: "01-es"
enabled: "{{ enable_elasticsearch | bool or enabled: "{{ enable_elasticsearch | bool or
( elasticsearch_address != kolla_internal_vip_address ) | bool }}" ( elasticsearch_address != kolla_internal_vip_address ) }}"
notify: notify:
- Restart fluentd container - Restart fluentd container
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
when: when:
- inventory_hostname in groups[keystone.group] - inventory_hostname in groups[keystone.group]
- keystone.enabled | bool - keystone.enabled | bool
- check_keystone_paste_ini.stat.exists | bool - check_keystone_paste_ini.stat.exists
notify: notify:
- Restart keystone container - Restart keystone container
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
when: when:
- inventory_hostname in groups[item.value.group] - inventory_hostname in groups[item.value.group]
- item.value.enabled | bool - item.value.enabled | bool
- nova_policy.stat.exists | bool - nova_policy.stat.exists
- item.key in services_require_policy_json - item.key in services_require_policy_json
with_dict: "{{ nova_services }}" with_dict: "{{ nova_services }}"
notify: notify:
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- include: external-ceph.yml - include: external-ceph.yml
when: when:
- enable_ceph | bool == False and nova_backend == "rbd" - not enable_ceph | bool and nova_backend == "rbd"
- inventory_hostname in groups['compute'] - inventory_hostname in groups['compute']
- include: register.yml - include: register.yml
......
...@@ -182,7 +182,7 @@ kolla_internal_vip_address: "10.10.10.254" ...@@ -182,7 +182,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_neutron_vpnaas: "no" #enable_neutron_vpnaas: "no"
#enable_nova_serialconsole_proxy: "no" #enable_nova_serialconsole_proxy: "no"
#enable_octavia: "no" #enable_octavia: "no"
#enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' | bool }}" #enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' }}"
#enable_osprofiler: "no" #enable_osprofiler: "no"
#enable_panko: "no" #enable_panko: "no"
#enable_rally: "no" #enable_rally: "no"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment