From 943edb6dd2731f7019576a8a227afd85c1aa9034 Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Mon, 20 Jun 2016 09:13:07 +0200
Subject: [PATCH] Fix permissions and kargo custom.yaml

---
 bootstrap-master.sh | 1 +
 bootstrap-node.sh   | 0
 deploy-k8s.kargo.sh | 2 +-
 ssh-keygen.sh       | 0
 4 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 bootstrap-master.sh
 mode change 100644 => 100755 bootstrap-node.sh
 mode change 100644 => 100755 deploy-k8s.kargo.sh
 mode change 100644 => 100755 ssh-keygen.sh

diff --git a/bootstrap-master.sh b/bootstrap-master.sh
old mode 100644
new mode 100755
index a9951fa8f..e22b1b506
--- a/bootstrap-master.sh
+++ b/bootstrap-master.sh
@@ -15,6 +15,7 @@ sudo pip install kpm
 
 # k8s deploy script and config
 sudo sh -c 'cp -a ~vagrant/deploy-k8s.kargo.sh /root/ && chmod 755 /root/deploy-k8s.kargo.sh'
+sudo git clone https://github.com/kubespray/kargo /root/kargo
 sudo cp -a ~vagrant/custom.yaml /root/kargo/custom.yaml
 
 # SSH keys and config
diff --git a/bootstrap-node.sh b/bootstrap-node.sh
old mode 100644
new mode 100755
diff --git a/deploy-k8s.kargo.sh b/deploy-k8s.kargo.sh
old mode 100644
new mode 100755
index 007a1cb23..e6e6f7c99
--- a/deploy-k8s.kargo.sh
+++ b/deploy-k8s.kargo.sh
@@ -15,7 +15,7 @@ else
 fi
 
 echo "Running deployment..."
-kargo deploy -y --ansible-opts="-e kargo/custom.yaml"
+kargo deploy -y --ansible-opts="-e @kargo/custom.yaml"
 deploy_res=$?
 
 if [ "$deploy_res" -eq "0" ]; then
diff --git a/ssh-keygen.sh b/ssh-keygen.sh
old mode 100644
new mode 100755