diff --git a/.gitignore b/.gitignore index 4c41abc96db54b572febf3f72ea22213f8f37071..1b5b64f053172aa80b40ba52836ad59dceaa02b9 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ dev/vagrant/storage/ releasenotes/build # Files generated by Ansible -ansible/site.retry +ansible/*.retry # Others .DS_Store diff --git a/ansible/roles/prechecks/tasks/package_checks.yml b/ansible/roles/prechecks/tasks/package_checks.yml index 1bdd44e1a3673138957e2b35207a1a5315eda667..a2c4f80ee5f147fc7cbd3a305b95906b3f8ebd66 100644 --- a/ansible/roles/prechecks/tasks/package_checks.yml +++ b/ansible/roles/prechecks/tasks/package_checks.yml @@ -10,7 +10,7 @@ local_action: command ansible --version register: result changed_when: false - failed_when: result.stdout | regex_replace('ansible (\\d+\\.\\d+\\.\\d+)', '\\1') | version_compare(ansible_version_max, '>=') + failed_when: result.stdout | regex_replace('ansible (\\d+\\.\\d+\\.\\d+)', '\\1') | version_compare(ansible_version_min, '<') # If this fails run "apt-get install linux-image-generic-lts-wily" - name: Checking LTS wily kernel version 4.2 on Ubuntu 14.04 diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index c8c94b048d9b0a3d58e2294225537987d019214e..42efa93dffb4c180c6ec6bdf017f5c50a618d7ba 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -1,4 +1,4 @@ docker_version_min: '1.10.0' docker_py_version_min: '1.6.0' -ansible_version_max: '2.0.0' +ansible_version_min: '2.0.0' ubuntu_kernel_version_min: '4.2'