diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-09 11:18:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-09 11:18:58 +0000 |
| commit | cc2fe74aef8778bcc5874860a3b4608782aba15c (patch) | |
| tree | 1729bce420ab9418b2f8c5900710c62090e8acb3 | |
| parent | f98fe8149bfdd711ab91c1162f27f1fa7d47d70d (diff) | |
| parent | 3b1b6abf5b0133ed79581d2970c8a9abaacd0a37 (diff) | |
| download | kolla-cc2fe74aef8778bcc5874860a3b4608782aba15c.tar.gz kolla-cc2fe74aef8778bcc5874860a3b4608782aba15c.zip | |
Merge "Fix the prechecks for the ansible version"
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | ansible/roles/prechecks/tasks/package_checks.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 4c41abc96..1b5b64f05 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 1bdd44e1a..a2c4f80ee 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 c8c94b048..42efa93df 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' |