summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-04 15:54:11 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-05 17:06:35 +0400
commitde6a685915bc8bd5444217bca511da35c94b4d59 (patch)
tree1d861f14ef74e24cd9bdae67d59abaf6a91b194c /ci
parente49e91d7aa740437c01e6531ef648d2dae97c11d (diff)
Turn on opendaylight scenario
* fix formula & reclass cluster model * bring in running states Change-Id: I8e66e69045f5c745f9aa6f59f7ce6d66b5bf1c95 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 77030a44d..f98246d3d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -264,12 +264,13 @@ update_pxe_network
start_vms virtual_nodes
check_connection
-# Openstack cluster setup
./salt.sh
-./openstack.sh
-# Enable dpdk on computes
-[[ "$DEPLOY_SCENARIO" =~ (ovs|dpdk) ]] && ./dpdk.sh
+# Openstack cluster setup
+for state in "${cluster_states[@]}"; do
+ echo "STATE: $state"
+ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} sudo /root/fuel/mcp/config/states/$state
+done
## Disable Fuel deployment engine
#