diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-10-21 21:27:18 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-10-21 18:12:59 +0000 |
| commit | 79379e83773f17aefe65cbcfa9dbc70146d37984 (patch) | |
| tree | 314bee91cb66e5ca0a26d7f4a8984b5c4f2a5d34 /mcp | |
| parent | c132eb192e4c2b49dc37a6d9f22dfd86caa3ddbd (diff) | |
Catch expected failuresopnfv-5.0.1
* neutron on computes (dpdk case: void state)
* mongodb server (incomplete initialization)
Change-Id: I3dd3266b5c2d1b155981f725e15742cd38ed899d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 24d9cdd384635d8c1a037d6341d63a9c9be039b1)
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/neutron_compute | 2 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index 70a2db607..f1285479e 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -9,6 +9,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x -salt -I 'neutron:compute' state.sls neutron +salt -I 'neutron:compute' state.sls neutron || true salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index aada4ad45..89733cc91 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -53,7 +53,7 @@ salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -salt -I 'mongodb:server' state.sls mongodb +salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"' salt -C 'I@mongodb:server and *01*' state.sls mongodb |