diff options
author | 2017-08-23 16:28:04 +0200 | |
---|---|---|
committer | 2017-08-23 16:28:04 +0200 | |
commit | c98e2683b290258eda15ffd1b02bcd907af47248 (patch) | |
tree | 26035dce4a1349991d8b72c2a189a0f7b1994f77 /mcp/config | |
parent | f3f8c094a817fa0f4a60ed25185b6ca226c630d1 (diff) |
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>
Diffstat (limited to 'mcp/config')
-rwxr-xr-x | mcp/config/states/dpdk | 3 | ||||
-rwxr-xr-x | mcp/config/states/maas | 2 | ||||
-rwxr-xr-x | mcp/config/states/networks | 1 | ||||
-rwxr-xr-x | mcp/config/states/neutron_compute | 3 | ||||
-rwxr-xr-x | mcp/config/states/opendaylight | 3 | ||||
-rwxr-xr-x | mcp/config/states/openstack | 3 | ||||
-rwxr-xr-x | mcp/config/states/openstack_ha | 3 |
7 files changed, 18 insertions, 0 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index 8834d47c1..c6cd2a5a8 100755 --- 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 fecd991c1..01d247ea3 100755 --- 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 6f294cea1..505153a8a 100755 --- 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 e2ffec6be..d58162100 100755 --- 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 3b1cf7594..bee4c8586 100755 --- 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 57ca5856b..5ded58c87 100755 --- 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 4a39d5102..2597e82e3 100755 --- 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 |