-#!/bin/bash -x
+#!/bin/bash -e
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-salt -I 'neutron:compute' state.sls neutron
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
+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'