From 88907aca794716d1a2db4cc31e03375720695424 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 1 Nov 2017 11:33:38 +0100
Subject: Use the existing ansible.cfg file

---
 ansible.cfg                     |  2 ++
 playbooks/openstack/README.md   | 15 +++++++--------
 playbooks/openstack/ansible.cfg | 24 ------------------------
 3 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 playbooks/openstack/ansible.cfg

diff --git a/ansible.cfg b/ansible.cfg
index 589a58e9d..f96bf871f 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -23,6 +23,8 @@ fact_caching = jsonfile
 fact_caching_connection = $HOME/ansible/facts
 fact_caching_timeout = 600
 callback_whitelist = profile_tasks
+inventory_ignore_extensions = secrets.py, .pyc, .cfg, .crt
+timeout = 30  # work around privilege escalation timeouts in ansible
 
 # Uncomment to use the provided BYO inventory
 #hostfile = inventory/byo/hosts
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index 875004cc9..4347ddaa8 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -197,27 +197,26 @@ the [advanced configuration][advanced-configuration].
 
 ### 3. Creating the OpenStack resources (VMs, networking, etc.)
 
-We will install the DNS server roles using ansible galaxy and then run
-the openstack provisioning playbook. The `ansible.cfg` file we provide
-has useful defaults -- copy it to the directory you're going to run
-Ansible from.
+We provide an `ansible.cfg` file which has some useful defaults -- you should
+copy it to the directory you're going to run `ansible-playbook` from.
 
 ```bash
-$ ansible-galaxy install -r openshift-ansible/playbooks/openstack/galaxy-requirements.yaml -p openshift-ansible/roles
-$ cp openshift-ansible/playbooks/openstack/ansible.cfg ansible.cfg
+$ cp openshift-ansible/ansible.cfg ansible.cfg
 ```
-(you will only need to do this once)
 
 Then run the provisioning playbook -- this will create the OpenStack
 resources:
 
 ```bash
-$ ansible-playbook -i inventory openshift-ansible/playbooks/openstack/openshift-cluster/provision.yaml
+$ ansible-playbook --user openshift -i inventory openshift-ansible/playbooks/openstack/openshift-cluster/provision.yaml
 ```
 
 If you're using multiple inventories, make sure you pass the path to
 the right one to `-i`.
 
+If your SSH private key is not in `~/.ssh/id_rsa` use the `--private-key`
+option to specify the correct path.
+
 
 ### 4. Installing OpenShift
 
diff --git a/playbooks/openstack/ansible.cfg b/playbooks/openstack/ansible.cfg
deleted file mode 100644
index ae5669c35..000000000
--- a/playbooks/openstack/ansible.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-# config file for ansible -- http://ansible.com/
-# ==============================================
-[defaults]
-ansible_user = openshift
-forks = 50
-# work around privilege escalation timeouts in ansible
-timeout = 30
-host_key_checking = false
-inventory = inventory
-inventory_ignore_extensions = secrets.py, .pyc, .cfg, .crt
-gathering = smart
-retry_files_enabled = false
-fact_caching = jsonfile
-fact_caching_connection = .ansible/cached_facts
-fact_caching_timeout = 900
-stdout_callback = skippy
-callback_whitelist = profile_tasks
-lookup_plugins = openshift-ansible/lookup_plugins
-
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=900s -o GSSAPIAuthentication=no
-control_path = /var/tmp/%%h-%%r
-pipelining = True
-- 
cgit v1.2.1