From f929f3f94c7c89e40f9c8e2b85293f496101aebe Mon Sep 17 00:00:00 2001
From: Akram Ben Aissi <akram@free.fr>
Date: Thu, 11 Dec 2014 13:52:16 +0100
Subject: Adding AWS support to openshift-ansible module - Update documentation
to say that ssh configuration need to point to the private key file -
Removing the -p argument when calling time .... because it is misintrepreted
by ruby - Turning the cluster.sh to agnostic in its help/error message by
replacing explicit reference to GCE by a a variable - Fixing a bug within the
playbooks that incorrectly references the minions and master fact group. -
Adding playbooks for AWS, which are almost of copy/paste for those of GCE -
Added environment variable OO_PROVIDER to allow definition of the provider.
Defaults is gce - TODO implement the terminate.yml cookbook
---
lib/ansible_helper.rb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'lib/ansible_helper.rb')
diff --git a/lib/ansible_helper.rb b/lib/ansible_helper.rb
index 76af73b0d..080c9d00b 100644
--- a/lib/ansible_helper.rb
+++ b/lib/ansible_helper.rb
@@ -25,7 +25,6 @@ module OpenShift
tmpfile = Tempfile.open('extra_vars') { |f| f.write(@extra_vars.to_json); f}
cmds = []
-
#cmds << 'set -x'
cmds << %Q[export ANSIBLE_FILTER_PLUGINS="#{Dir.pwd}/filter_plugins"]
@@ -35,8 +34,7 @@ module OpenShift
# We need pipelining off so that we can do sudo to enable the root account
cmds << %Q[export ANSIBLE_SSH_PIPELINING='#{@pipelining.to_s}']
- cmds << %Q[time -p ansible-playbook -i #{@inventory} #{@verbosity} #{playbook} --extra-vars '@#{tmpfile.path}']
-
+ cmds << %Q[time ansible-playbook -i #{@inventory} #{@verbosity} #{playbook} --extra-vars '@#{tmpfile.path}' ]
cmd = cmds.join(' ; ')
pid = spawn(cmd, :out => $stdout, :err => $stderr, :close_others => true)
--
cgit v1.2.3