[virtual] Apply nova controller state twice

[fuel.git] / mcp / config / states / neutron_compute

diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index 6266b0f..f128547 100755 (executable)
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -1,6 +1,14 @@
-#!/bin/bash
-set -x
+#!/bin/bash -e
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# 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'