From fec601a23858adc6d6721e177314c4bfc72fe55f Mon Sep 17 00:00:00 2001
From: Aleksandr Didenko <adidenko@mirantis.com>
Date: Thu, 30 Jun 2016 16:56:52 +0200
Subject: [PATCH] Minor improvements in commands and readme

---
 README.md           |  7 +++++++
 bootstrap-master.sh | 18 ++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 533064368..a4b6b5022 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,13 @@ cd ~/mcp
 ./bootstrap-master.sh
 ```
 
+* Check nodes list and make sure you have SSH access to them
+
+```bash
+cd ~/mcp
+cat nodes
+```
+
 * Deploy k8s using kargo playbooks
 
 ```bash
diff --git a/bootstrap-master.sh b/bootstrap-master.sh
index 8a70e2fa3..fdbc9808f 100755
--- a/bootstrap-master.sh
+++ b/bootstrap-master.sh
@@ -6,16 +6,22 @@ apt-get --yes upgrade
 apt-get --yes install git screen vim telnet tcpdump python-setuptools gcc python-dev python-pip libssl-dev libffi-dev software-properties-common curl
 
 # Get ansible-2.1+, vanilla ubuntu-16.04 ansible (2.0.0.2) is broken due to https://github.com/ansible/ansible/issues/13876
-apt-add-repository -y ppa:ansible/ansible;apt-get update;apt-get install -y ansible
+ansible --version || (
+  apt-add-repository -y ppa:ansible/ansible
+  apt-get update
+  apt-get install -y ansible
+)
 
 # Kargo-cli
-git clone https://github.com/kubespray/kargo-cli.git /root/kargo-cli
-pushd /root/kargo-cli
-python setup.py install
-popd
+kargo --version || (
+  git clone https://github.com/kubespray/kargo-cli.git /root/kargo-cli
+  pushd /root/kargo-cli
+  python setup.py install
+  popd
+)
 
 # Copy/create nodes list
-cp /var/tmp/nodes ./nodes
+test -f ./nodes || cp /var/tmp/nodes ./nodes
 
 # Either pull or copy microservices repos
 cp -a /var/tmp/microservices* ./ccp/