diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-20 17:48:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-20 17:48:25 +0000 |
| commit | 6e9c51898e83f5e4e324654a8958d7142d21ab7c (patch) | |
| tree | 5d910280b17757d6f35ce41f1a68d8f745168919 | |
| parent | 59bc1b8d746709d0a8c2da1416c4773f467fc56b (diff) | |
| parent | d7495b1d39672f14de7598714984754b8406e5f4 (diff) | |
| download | kolla-6e9c51898e83f5e4e324654a8958d7142d21ab7c.tar.gz kolla-6e9c51898e83f5e4e324654a8958d7142d21ab7c.zip | |
Merge "Fix the prechecks role idempotent"
| -rw-r--r-- | ansible/roles/prechecks/tasks/package_checks.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/prechecks/tasks/service_checks.yml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ansible/roles/prechecks/tasks/package_checks.yml b/ansible/roles/prechecks/tasks/package_checks.yml index 5c927e63e..ef8147fd9 100644 --- a/ansible/roles/prechecks/tasks/package_checks.yml +++ b/ansible/roles/prechecks/tasks/package_checks.yml @@ -2,10 +2,12 @@ - name: Checking docker-py version command: python -c "import docker; print docker.__version__" register: result + changed_when: false failed_when: result | failed or result.stdout | version_compare(docker_py_version_min, '<') - name: Checking Ansible version 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, '>=') diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml index 8dcbda0fb..262e6f714 100644 --- a/ansible/roles/prechecks/tasks/service_checks.yml +++ b/ansible/roles/prechecks/tasks/service_checks.yml @@ -8,12 +8,14 @@ - name: Checking Docker version command: docker version register: result + changed_when: false failed_when: result | failed or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<') - name: Checking if 'MountFlags' in /lib/systemd/system/docker.service is set to 'shared' command: cat /lib/systemd/system/docker.service register: result + changed_when: false failed_when: result.stdout.find('MountFlags=shared') == -1 when: - (inventory_hostname in groups['neutron-dhcp-agent'] @@ -25,6 +27,7 @@ - name: Checking if '/run' mount flag is set to 'shared' command: awk '$5 == "/run" {print $7}' /proc/self/mountinfo register: result + changed_when: false failed_when: result.stdout.find('shared') == -1 when: - (inventory_hostname in groups['neutron-dhcp-agent'] |