Remove "| bool" 1.5yrs later, as Ansible 2.10 changed conditional_bare_variables default

roles/0-DEPRECATED-ROLES/activity-server/tasks/main.yml

@@ -80,7 +80,7 @@
 # SEE ALSO THE apache2_module SECTION IN roles/httpd/tasks/main.yml
 - name: enable mod_expires for debian
   command: a2enmod expires
-  when: is_debuntu | bool
+  when: is_debuntu
 
 - name: create the link which enables the site
   file: src=/etc/apache2/sites-available/xs-activity-server.conf

roles/0-DEPRECATED-ROLES/ajenti/tasks/ajenti-wondershaper.yml

@@ -1,3 +1,3 @@
 - name: Install wondershaper ajenti plugin
   pip: name="{{ iiab_download_url }}"/ajenti-plugin-wondershaper-0.3.tar.gz
-  when: internet_available | bool
+  when: internet_available

roles/0-DEPRECATED-ROLES/ajenti/tasks/main.yml

@@ -45,7 +45,7 @@
   service: name=ajenti
            enabled=yes
            state=restarted
-  when: ajenti_enabled | bool
+  when: ajenti_enabled
 
 - name: Add 'ajenti' variable values to {{ iiab_ini_file }}
   ini_file:

roles/0-DEPRECATED-ROLES/authserver/tasks/main.yml

@@ -4,7 +4,7 @@
 
 - name: Install xs-authserver from pypi
   pip: name=xs-authserver
-  when: internet_available | bool
+  when: internet_available
 
 - name: install gunicorn
   package: name=python-gunicorn
@@ -48,7 +48,7 @@
   service: name=xs-authserver
            state=restarted
            enabled=yes
-  when: authserver_enabled | bool
+  when: authserver_enabled
 
 - name: Add 'authserver' variable values to {{ iiab_ini_file }}
   ini_file:

roles/0-DEPRECATED-ROLES/docker/tasks/main.yml

@@ -4,7 +4,7 @@
   with_items:
     - docker
     - python-docker-py
-  when: docker_install | bool
+  when: docker_install
 
 - name: put the systemd startup file in place
   template: src=docker.service
@@ -31,7 +31,7 @@
   service: name=docker
            state=started
            enabled=true
-  when: docker_enabled | bool
+  when: docker_enabled
 
 - name: Disable docker
   service: name=docker

roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml

@@ -12,7 +12,7 @@
   systemd:
     name: "{{ apache_service }}"
     state: restarted
-  when: apache_enabled | bool
+  when: apache_enabled
 
 # NGINX
 
@@ -32,7 +32,7 @@
   systemd:
     name: nginx
     state: restarted
-  when: nginx_enabled | bool
+  when: nginx_enabled
 
 
 - name: Add 'dokuwiki' variable values to {{ iiab_ini_file }}

roles/0-DEPRECATED-ROLES/dokuwiki/tasks/install.yml

@@ -3,7 +3,7 @@
     url: "{{ iiab_download_url }}/{{ dokuwiki_version }}.tgz"
     dest: "{{ downloads_dir }}/"
     timeout: "{{ download_timeout }}"
-  when: internet_available | bool
+  when: internet_available
 
 - name: Unarchive (unpack) it to /library/{{ dokuwiki_version }}
   unarchive:

roles/0-DEPRECATED-ROLES/ejabberd/tasks/main.yml

@@ -34,7 +34,7 @@
 #    src: ejabberd-iiab.init
 #    dest: /etc/init.d/ejabberd-iiab
 #    mode: 0755
-#  when: is_debuntu | bool
+#  when: is_debuntu
 
 #- name: Put the startup script in place - non debian
 #  template:
@@ -71,7 +71,7 @@
     #name: ejabberd-iiab
     state: restarted
     enabled: yes
-  when: ejabberd_enabled | bool
+  when: ejabberd_enabled
   #when: ejabberd_config.changed and ejabberd_enabled
 
 #- name: Wait for ejabberd service start

roles/0-DEPRECATED-ROLES/homepage/tasks/main.yml

@@ -18,4 +18,4 @@
   #   src: "/etc/{{ apache_conf_dir }}/iiab-homepage.conf"
   #   path: /etc/apache2/sites-enabled/iiab-homepage.conf
   #   state: link
-  # when: is_debuntu | bool
+  # when: is_debuntu

roles/0-DEPRECATED-ROLES/idmgr/tasks/main.yml

@@ -42,7 +42,7 @@
   with_items:
     - idmgr
     - xinetd
-  when: xo_services_enabled | bool
+  when: xo_services_enabled
 
 - name: Disable idmgr service
   service: name={{ item }}

roles/0-DEPRECATED-ROLES/nodogsplash/tasks/main.yml

@@ -1,3 +1,3 @@
 - name: Install nodogsplash (Raspbian only)
   include_tasks: rpi.yml
-  when: is_raspbian | bool
+  when: is_raspbian

roles/0-DEPRECATED-ROLES/nodogsplash/tasks/rpi.yml

@@ -8,7 +8,7 @@
      url: "{{ iiab_download_url }}/{{ nodogsplash_arm_deb }}"
      dest: "{{ downloads_dir }}/{{ nodogsplash_arm_deb }}"
      timeout: "{{ download_timeout }}"
-  when: internet_available | bool
+  when: internet_available
   #async: 300
   #poll: 5
 
@@ -43,7 +43,7 @@
     name: nodogsplash
     enabled: yes
     state: started
-  when: nodogsplash_enabled | bool
+  when: nodogsplash_enabled
 
 - name: Disable 'nodogsplash' systemd service, if not nodogsplash_enabled
   systemd:

roles/0-DEPRECATED-ROLES/osm/tasks/main.yml

@@ -7,7 +7,7 @@
       - libapache2-mod-wsgi
       - libapache2-mod-xsendfile
     state: present
-  when: is_debuntu | bool
+  when: is_debuntu
 
 - name: Install 6 OSM required packages (not debuntu)
   package:
@@ -110,7 +110,7 @@
     group: root
     mode: 0644
     backup: no
-  when: osm_enabled | bool
+  when: osm_enabled
 
 - name: Create softlink osm.conf from sites-enabled to sites-available (debuntu)
   file:
@@ -144,7 +144,7 @@
     owner: root
     group: root
     state: link
-  when: osm_enabled | bool
+  when: osm_enabled
 
 - name: Create dir /library/knowledge/modules
   file:
@@ -165,7 +165,7 @@
     - { src: 'map.html', dest: "{{ osm_path }}/static/map.html" }
     - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" }
     - { src: "{{ osm_path }}/static/map.html", dest: "{{ osm_path }}/static/index.html" }
-  when: osm_enabled | bool
+  when: osm_enabled
 
 - name: Restart httpd service
   service:

roles/0-DEPRECATED-ROLES/owncloud/tasks/main.yml

@@ -4,7 +4,7 @@
 - name: add a repo def for ubuntu
   template: dest=/etc/apt/sources.list.d/
             src=owncloud.list
-  when: is_ubuntu | bool
+  when: is_ubuntu
 
 - name: See if the owncloud startup page exists
   stat: path={{ owncloud_prefix }}/owncloud/index.php
@@ -40,7 +40,7 @@
 
 - name: Get the owncloud software
   get_url: url={{ iiab_download_url }}/{{ owncloud_src_file }}  dest={{ downloads_dir }}/{{ owncloud_src_file }}
-  when: internet_available | bool
+  when: internet_available
   async: 300
   poll: 5
 
@@ -54,7 +54,7 @@
 - name: Copy it to permanent location /opt
   unarchive: src={{ downloads_dir }}/{{ owncloud_src_file }}
              dest={{ owncloud_prefix }}
-  when: is_F18 | bool
+  when: is_F18
 
 - name: in Centos, the following config dir is symlink to /etc/owncloud
   file: path=/etc/owncloud
@@ -103,7 +103,7 @@
 # Enable owncloud by copying template to httpd config
 
 - include_tasks: owncloud_enabled.yml
-  when: owncloud_enabled | bool
+  when: owncloud_enabled
 
 - name: Add 'owncloud' variable values to {{ iiab_ini_file }}
   ini_file:

roles/0-DEPRECATED-ROLES/pathagar/tasks/main.yml

@@ -29,7 +29,7 @@
     - libapache2-mod-wsgi
     - libxml2-dev
     - libxslt-dev
-  when: is_debuntu | bool
+  when: is_debuntu
 
 - name: "Install Pathagar prerequisites: mod_wsgi, libxml2-devel, libxslt-devel (not debuntu)"
   package:
@@ -78,7 +78,7 @@
     - django-tagging==0.3.1
     - django-sendfile==0.3.6
     - lxml==3.4.4
-  when: internet_available | bool
+  when: internet_available
 
 - name: Install Pathagar requirements in a virtualenv
   pip:

roles/0-DEPRECATED-ROLES/schooltool/tasks/main.yml

@@ -41,13 +41,13 @@
   service: name=docker
            state=restarted
            enabled=yes
-  when: schooltool_enabled | bool
+  when: schooltool_enabled
 
 - name: Enable schooltool
   service: name=schooltool
            state=started
            enabled=yes
-  when: schooltool_enabled | bool
+  when: schooltool_enabled
 
 - name: Disable schooltool
   service: name=schooltool

roles/0-DEPRECATED-ROLES/sugar-stats/tasks/main.yml

@@ -29,7 +29,7 @@
 - name: Enable sugar-stats service
   service: name=sugar-stats-server
            enabled=yes
-  when: sugar_stats_enabled | bool
+  when: sugar_stats_enabled
 
 - name: Disable sugar-stats service
   service: name=sugar-stats-server

roles/0-DEPRECATED-ROLES/sugar-stats/tasks/statistics-consolidation.yml

@@ -4,7 +4,7 @@
 
 - name: Install statistics-consolidation with pip
   pip: name=stats-consolidation version=2.1.2
-  when: internet_available | bool
+  when: internet_available
 
 - name: Install required libraries
   package: name={{ item }}

roles/0-DEPRECATED-ROLES/teamviewer/tasks/install.yml

@@ -20,7 +20,7 @@
     url: "{{ teamviewer_url }}/{{ teamviewer_rpm_file }}"
     dest: "{{ yum_packages_dir }}/{{ teamviewer_rpm_file }}"
     timeout: "{{ download_timeout }}"
-  when: internet_available | bool
+  when: internet_available
 
 # F22 has issues with yum localinstall exclude for now
 - name: Do the install of TeamViewer, pulling in any required dependencies

roles/0-DEPRECATED-ROLES/teamviewer/tasks/main.yml

@@ -6,7 +6,7 @@
 
 - name: Install Teamviewer if intel
   include_tasks: install.yml
-  when: teamviewer_install | bool
+  when: teamviewer_install
 
 - name: Add 'teamviewer' variable values to {{ iiab_ini_file }}
   ini_file:

roles/0-DEPRECATED-ROLES/xovis/tasks/main.yml

@@ -7,7 +7,7 @@
     - python-pip
     - nodejs
     - npm
-  when: internet_available | bool
+  when: internet_available
 
 - name: Determine if xovis is already downloaded
   stat: path={{ downloadds_dir }}/xovis/xxx
@@ -23,7 +23,7 @@
   npm: name=kanso
        global=yes
        path={{ downloads_dir }}
-  when: internet_available | bool
+  when: internet_available
 
 - name: move the xovis repo into place
   shell: "cp -rp {{ downloads_dir }}/xovis {{ xovis_root }}"
@@ -37,7 +37,7 @@
 
 - name: Install the xovis python dependencies
   pip: requirements={{ xovis_root }}/process_stats/requirements.txt
-  when: internet_available | bool
+  when: internet_available
 
 - name: Update xovis repo with Chart Heading
   lineinfile: dest="{{ xovis_root }}/index.html" regexp='(.+)<h1>(.*)</h1>' line='\1<h1>{{ xovis_chart_heading }}</h1>' backrefs=yes
@@ -49,17 +49,17 @@
   service: name=couchdb
            enabled=yes
            state=started
-  when: xovis_enabled | bool
+  when: xovis_enabled
 
 - name: Wait for CouchDB to become ready
   wait_for: port=5984
             delay=1
             timeout=5
-  when: xovis_enabled | bool
+  when: xovis_enabled
 
 - name: Add admin user
   command: curl -X PUT {{ xovis_target_host }}/_config/admins/{{ xovis_db_user }} -d "\"{{ xovis_db_password }}\""
-  when: xovis_enabled | bool
+  when: xovis_enabled
 
 - name: Check if db exists
   shell: "kanso listdb | grep {{ xovis_db_name }}"
@@ -79,7 +79,7 @@
   -d {{ xovis_backup_dir }}
   --deployment {{ xovis_deployment_name }}
   --server http://{{ xovis_db_login }}@{{ xovis_target_host }}"
-  when: xovis_enabled | bool
+  when: xovis_enabled
 
 - name: Add 'xovis' variable values to {{ iiab_ini_file }}
   ini_file: