diff options
| author | Russell Teague <rteague@redhat.com> | 2017-12-15 13:56:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 13:56:28 -0500 |
| commit | d96898b3138c4d85ba8e2d8fd34734029697777c (patch) | |
| tree | 573fdd49e86e3fc68fe47bae84ddfa50ccdaa6f1 /roles/contiv | |
| parent | e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3 (diff) | |
| parent | c113074f5b84881f416aca40e2bf4e20d4e6ce41 (diff) | |
| download | openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.gz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.bz2 openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.xz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.zip | |
Merge pull request #6484 from mtnbikenc/tests-as-filters
Deprecate using Ansible tests as filters
Diffstat (limited to 'roles/contiv')
| -rw-r--r-- | roles/contiv/tasks/download_bins.yml | 2 | ||||
| -rw-r--r-- | roles/contiv/tasks/netplugin.yml | 6 | ||||
| -rw-r--r-- | roles/contiv/tasks/pkgMgrInstallers/centos-install.yml | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/roles/contiv/tasks/download_bins.yml b/roles/contiv/tasks/download_bins.yml index 741c1d1da..831fd360a 100644 --- a/roles/contiv/tasks/download_bins.yml +++ b/roles/contiv/tasks/download_bins.yml @@ -9,7 +9,7 @@ name: bzip2 state: installed register: result - until: result | success + until: result is succeeded - name: Download Bins | Download Contiv tar file get_url: diff --git a/roles/contiv/tasks/netplugin.yml b/roles/contiv/tasks/netplugin.yml index cf92a8cc0..540f6e4bc 100644 --- a/roles/contiv/tasks/netplugin.yml +++ b/roles/contiv/tasks/netplugin.yml @@ -101,15 +101,15 @@ - name: systemd reload command: systemctl daemon-reload - when: docker_updated|changed + when: docker_updated is changed - name: Docker | Restart docker service: name: "{{ openshift_docker_service_name }}" state: restarted - when: docker_updated|changed + when: docker_updated is changed register: l_docker_restart_docker_in_contiv_result - until: not l_docker_restart_docker_in_contiv_result | failed + until: not (l_docker_restart_docker_in_contiv_result is failed) retries: 3 delay: 30 diff --git a/roles/contiv/tasks/pkgMgrInstallers/centos-install.yml b/roles/contiv/tasks/pkgMgrInstallers/centos-install.yml index a4d260279..53c5b4099 100644 --- a/roles/contiv/tasks/pkgMgrInstallers/centos-install.yml +++ b/roles/contiv/tasks/pkgMgrInstallers/centos-install.yml @@ -4,7 +4,7 @@ pkg=net-tools state=latest register: result - until: result | success + until: result is succeeded - name: PkgMgr RHEL/CentOS | Get openstack ocata rpm get_url: @@ -23,7 +23,7 @@ tags: - ovs_install register: result - until: result | success + until: result is succeeded - name: PkgMgr RHEL/CentOS | Install ovs yum: @@ -36,4 +36,4 @@ tags: - ovs_install register: result - until: result | success + until: result is succeeded |