From aea48b733ea36cf7f691ce4ad9383fa79f2f7c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Fri, 15 Jan 2016 22:02:43 +0100
Subject: [PATCH] Remove ansible.cfg, we use .ssh/config now

Change-Id: I257bd0c7050516746ff77b8ef09dc169b945deae
---
 Vagrantfile                    |  1 -
 bootstrap/ansible.cfg          |  2 --
 bootstrap/playbooks/solar.yaml |  2 --
 bootstrap/solar-master.json    | 10 +++-------
 utils/jenkins/run.sh           |  2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 bootstrap/ansible.cfg

diff --git a/Vagrantfile b/Vagrantfile
index 9db8bce8..fa5716c3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -116,7 +116,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       config.vm.host_name = "solar-dev#{index}"
 
       if PREPROVISIONED
-        config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"
         config.vm.provision "shell", inline: solar_agent_script, privileged: true
         #TODO(bogdando) figure out how to configure multiple interfaces when was not PREPROVISIONED
         ind = 0
diff --git a/bootstrap/ansible.cfg b/bootstrap/ansible.cfg
deleted file mode 100644
index 14c80651..00000000
--- a/bootstrap/ansible.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[defaults]
-host_key_checking = False
diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml
index 3b9cd90b..3fc5fe85 100644
--- a/bootstrap/playbooks/solar.yaml
+++ b/bootstrap/playbooks/solar.yaml
@@ -59,6 +59,4 @@
 
     - name: start riak container
       shell: docker-compose up -d riak chdir=/vagrant
-    - name: configuring Ansible
-      copy: src=/vagrant/bootstrap/ansible.cfg dest=/home/vagrant/.ansible.cfg
     - include: tasks/celery_init.yaml
diff --git a/bootstrap/solar-master.json b/bootstrap/solar-master.json
index e949f1c0..987905e7 100644
--- a/bootstrap/solar-master.json
+++ b/bootstrap/solar-master.json
@@ -112,16 +112,12 @@
     ]}, {
       "type": "shell",
       "inline": ["sudo mkdir -p {{ user `ansible_config_path` }}"]
-    }, {
-      "type": "file",
-      "source": "ansible.cfg",
-      "destination": "/tmp/ansible.cfg"
-    }, {
-      "type": "shell",
-      "inline": ["sudo mv /tmp/ansible.cfg {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}"]
     }, {
       "type": "shell",
       "inline": [
+        "touch /tmp/ansible.cfg",
+        "sudo mv /tmp/ansible.cfg {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
+        "sudo echo '[defaults]' >> {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
         "sudo echo 'log_path = {{ user `ansible_log_file` }}' >> {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
         "sudo touch {{ user `ansible_log_file` }}",
         "sudo chmod 666 {{ user `ansible_log_file` }}"
diff --git a/utils/jenkins/run.sh b/utils/jenkins/run.sh
index 02e91ce2..e2a81da1 100755
--- a/utils/jenkins/run.sh
+++ b/utils/jenkins/run.sh
@@ -21,7 +21,7 @@ ENV_NAME=${ENV_NAME} SLAVES_COUNT=${SLAVES_COUNT} IMAGE_PATH=${IMAGE_PATH} CONF_
 # Wait for master to boot
 sleep 30
 
-sshpass -p ${ADMIN_PASSWORD} rsync -az . -e ssh ${ADMIN_USER}@${ADMIN_IP}:/home/vagrant/solar --include bootstrap/playbooks --include bootstrap/ansible.cfg --exclude "bootstrap/*" --exclude .tox --exclude tmp --exclude x-venv
+sshpass -p ${ADMIN_PASSWORD} rsync -az . -e ssh ${ADMIN_USER}@${ADMIN_IP}:/home/vagrant/solar --include bootstrap/playbooks --exclude "bootstrap/*" --exclude .tox --exclude tmp --exclude x-venv
 
 sshpass -p ${ADMIN_PASSWORD} ssh ${ADMIN_USER}@${ADMIN_IP} bash -s <<EOF
 set -x