Merge pull request #53 from twiest/atomic

Changed os2-atomic-proxy to be able to launch inside of both a vpc and classic. Changed STG to default to launching in a vpc, prod still launches in classic. Also cleaned up some cruft.

3 files changed, 0 insertions, 12 deletions

diff --git a/lib/ansible_helper.rb b/lib/ansible_helper.rb
index 080c9d00b..395bb51a8 100644
--- a/lib/ansible_helper.rb
+++ b/lib/ansible_helper.rb
@@ -89,13 +89,6 @@ extra_vars: #{@extra_vars.to_json}
         ah.inventory = 'inventory/aws/ec2.py'
         return ah
       end
-
-
-      def ignore_bug_6407
-        puts
-        puts %q[ .----  Spurious warning "It is unnecessary to use '{{' in loops" (ansible bug 6407)  ----.]
-        puts %q[ V                                                                                        V]
-      end
     end
   end
 end
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 288a539a1..1c3efc91c 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -42,7 +42,6 @@ module OpenShift
 
         puts
         puts "Creating #{options[:count]} #{options[:type]} instance(s) in AWS..."
-        ah.ignore_bug_6407
 
         # Make sure we're completely up to date before launching
         clear_cache()
@@ -91,7 +90,6 @@ module OpenShift
 
         puts
         puts "Configuring #{options[:type]} instance(s) in AWS..."
-        ah.ignore_bug_6407
 
         ah.run_playbook("playbooks/aws/#{host_type}/config.yml")
       end
diff --git a/lib/gce_command.rb b/lib/gce_command.rb
index 8be8fb357..54dbf29ba 100644
--- a/lib/gce_command.rb
+++ b/lib/gce_command.rb
@@ -43,7 +43,6 @@ module OpenShift
 
         puts
         puts "Creating #{options[:count]} #{options[:type]} instance(s) in GCE..."
-        ah.ignore_bug_6407
 
         ah.run_playbook("playbooks/gce/#{options[:type]}/launch.yml")
       end
@@ -80,7 +79,6 @@ module OpenShift
 
         puts
         puts "Configuring #{options[:type]} instance(s) in GCE..."
-        ah.ignore_bug_6407
 
         ah.run_playbook("playbooks/gce/#{host_type}/config.yml")
       end
@@ -118,7 +116,6 @@ module OpenShift
 
         puts
         puts "Terminating #{options[:type]} instance(s) in GCE..."
-        ah.ignore_bug_6407
 
         ah.run_playbook("playbooks/gce/#{host_type}/terminate.yml")
       end