summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-24 06:04:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-24 06:04:09 +0000
commit599a570c55aab972aed0b98998e9b85c54a88408 (patch)
tree6777631ec85b08010fd9df33991f60d2a7983392
parent00bf737316a29867a1fcc38753418d6e2fff9f27 (diff)
parentc98e2683b290258eda15ffd1b02bcd907af47248 (diff)
Merge "ci/deploy.sh, states: bash debug, continue on err"
-rwxr-xr-xci/deploy.sh2
-rwxr-xr-xmcp/config/states/dpdk3
-rwxr-xr-xmcp/config/states/maas2
-rwxr-xr-xmcp/config/states/networks1
-rwxr-xr-xmcp/config/states/neutron_compute3
-rwxr-xr-xmcp/config/states/opendaylight3
-rwxr-xr-xmcp/config/states/openstack3
-rwxr-xr-xmcp/config/states/openstack_ha3
8 files changed, 19 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index cf7b3b35b..f51ba5fb0 100755
--- 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 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