ci/deploy.sh, states: bash debug, continue on err

Since we don't `set -e` in state files, applying each state will
always succeed unless the last instruction in the state fails.
Make this uniform by always succeeding in applying the state.

While at it, enable bash debugging logs, for better readability
of deploy log files.

Change-Id: I3cf4886f6d73c6fd1380df1a4e1413334bec1701
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index cf7b3b3..f51ba5f 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -336,7 +336,7 @@ for state in "${cluster_states[@]}"; do
     notify "STATE: ${state}\n" 2
     # shellcheck disable=SC2086,2029
     ssh ${SSH_OPTS} "ubuntu@${SALT_MASTER}" \
-        sudo "/root/fuel/mcp/config/states/${state}"
+        sudo "/root/fuel/mcp/config/states/${state} || true"
 done
 
 popd > /dev/null

diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index 8834d47..c6cd2a5 100755 (executable)
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -1,3 +1,6 @@
+#!/bin/bash
+set -x
+
 salt -I 'nova:compute' system.reboot
 while true; do salt -I 'nova:compute' test.ping | fgrep -q 'Not connected' || break; done
 salt -I 'nova:compute' state.sls linux.network.dpdk

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index fecd991..01d247e 100755 (executable)
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x
+
 function wait_for() {
   local cmdstr=$@
   local total_attempts=360

diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 6f294ce..505153a 100755 (executable)
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 # Determine public network based on external IPs from compute node
 # NOTE: mask currently hardcoded to /24

diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index e2ffec6..d581621 100755 (executable)
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -1 +1,4 @@
+#!/bin/bash
+set -x
+
 salt -I 'neutron:compute' state.sls neutron

diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index 3b1cf75..bee4c85 100755 (executable)
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -1,3 +1,6 @@
+#!/bin/bash
+set -x
+
 salt -I 'opendaylight:server' state.sls opendaylight
 salt -I 'opendaylight:client' state.sls opendaylight.client
 salt -I 'neutron:server' state.sls opendaylight.client

diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 57ca585..5ded58c 100755 (executable)
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -1,3 +1,6 @@
+#!/bin/bash
+set -x
+
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status"
 

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 4a39d51..2597e82 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,3 +1,6 @@
+#!/bin/bash
+set -x
+
 salt -I 'keepalived:cluster' state.sls keepalived -b 1
 salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address