From 8d802653927d1f53da49f86aab6d64b1fb8120e6 Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Wed, 29 Jun 2016 11:24:20 +0200
Subject: [PATCH] Use ansible instead of kargo-cli to deploy k8s

---
 ccp/ccp-deploy.sh   | 3 ++-
 deploy-k8s.kargo.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccp/ccp-deploy.sh b/ccp/ccp-deploy.sh
index c29795596..6283d50e1 100755
--- a/ccp/ccp-deploy.sh
+++ b/ccp/ccp-deploy.sh
@@ -21,6 +21,7 @@ assign_node_roles() {
 create_network_conf
 assign_node_roles
 
-kubectl delete namespace openstack && sleep 40
+kubectl delete namespace openstack && sleep 120
+
 mcp-microservices --config-file=/root/mcp.conf deploy -t /root/cluster-topology.yaml
 
diff --git a/deploy-k8s.kargo.sh b/deploy-k8s.kargo.sh
index 92801d421..514157c5b 100755
--- a/deploy-k8s.kargo.sh
+++ b/deploy-k8s.kargo.sh
@@ -17,7 +17,8 @@ else
 fi
 
 echo "Running deployment..."
-kargo deploy -y --ansible-opts="-e @custom.yaml"
+#kargo deploy -y --ansible-opts="-e @custom.yaml"
+ansible-playbook -i $INVENTORY kargo/cluster.yml -e @custom.yaml
 deploy_res=$?
 
 if [ "$deploy_res" -eq "0" ]; then