rhc 1.1.11 → 1.2.7

data/features/support/before_hooks.rb

@@ -1,4 +1,5 @@
 Before('@clean') do
+  puts "Cleaning applications and keys now"
   clean_applications(true)
 end
 
@@ -8,24 +9,41 @@ Before('@sshkey') do
 end
 
 Before('@sshkey','@key1') do
-  Given 'a new SSH key "key1.pub" is added as "key1"'
+  step 'a new SSH key "key1.pub" is added as "key1"'
 end
 
 # Defined the required hooks first so we make sure we have everything we need
 Before('@geared_user_required') do
+  $old_username = $username
   $username = "user_with_multiple_gear_sizes@test.com"
+  $namespace = nil
+end
+
+After do
+  if $old_username
+    $username = $old_username
+    $namespace = nil
+    $old_username = nil
+    $old_namespace = nil
+  end
+end
+
+Before('@cartridge_storage_user_required') do
+  $old_username = $username
+  $username = "user_with_extra_storage@test.com"
+  $namespace = nil
 end
 
 Before('@domain_required') do
-  When 'we have an existing domain'
+  step 'we have an existing domain'
 end
 
 Before('@client_tools_required') do
-  When 'we have the client tools setup'
+  step 'we have the client tools setup'
 end
 
 Before('@single_cartridge','@init') do
-  When 'an existing or new php-5.3 application without an embedded cartridge'
+  step 'an existing or new php-5.3 application without an embedded cartridge'
 end
 
 # These assumptions help to ensure any steps that are run independently have the same state as after the @init step
@@ -38,6 +56,6 @@ end
   :multiple_cartridge => 'an existing or new php-5.3 application with embedded mysql-5.1 and phpmyadmin-3.4 cartridges',
 }.each do |tag,assumption|
     Before("@#{tag}",'~@init') do
-      When assumption
+      step assumption
     end
   end

data/features/support/env.rb

@@ -7,6 +7,7 @@ require 'rhc_helper'
 require 'rhc/rest'
 require 'rhc/config'
 require 'rhc/helpers'
+require 'rhc/commands'
 
 def set_path
   ENV["PATH"] = "#{ENV['RHC_LOCAL_PATH']}:#{ENV['PATH']}" if ENV['RHC_LOCAL_PATH']
@@ -87,10 +88,13 @@ _log "\n\n"
 
 def clean_applications(leave_domain = false)
   return if ENV['NO_CLEAN']
-  users = [$username,'user_with_multiple_gear_sizes@test.com']
+  users = [$username,'user_with_multiple_gear_sizes@test.com','user_with_extra_storage@test.com']
 
   _log "  Cleaning up test applications..."
 
+  $namespace = nil unless leave_domain
+  $keyed_users = []
+
   users.each do |user|
     _log "\tUser: #{user}"
     client = RHC::Rest::Client.new($end_point, user, $password)
@@ -104,6 +108,10 @@ def clean_applications(leave_domain = false)
       end
       domain.delete unless leave_domain
     end
+    client.sshkeys.each do |key|
+      _log "\t\tKey: #{key.name}"
+      key.delete
+    end
   end
 end
 
@@ -118,6 +126,7 @@ unless ENV['NO_CLEAN']
   # Start with a clean config
   _log "  Replacing express.conf with the specified libra_server"
   File.open(RHC::Config::local_config_path, 'w') {|f| f.write("libra_server=#{URI.parse($end_point).host}") }
+  RHC::Config.initialize
 
   # Clean up temp dir
   FileUtils.rm_rf RHCHelper::TEMP_DIR
@@ -138,6 +147,8 @@ AfterConfiguration do |config|
 
   # Modify the .ssh/config so the git and ssh commands can succeed
   keyfile = RHCHelper::Sshkey.keyfile_path('key1')
+  File.chmod(0600,keyfile)
+
   begin
     File.open('/root/.ssh/config','w',0600) do |f|
       f.puts "Host *"
@@ -147,10 +158,9 @@ AfterConfiguration do |config|
     end
   rescue Errno::ENOENT, Errno::EACCES
   end
-  File.chmod(0600,keyfile)
 
   # Setup the logger
-  logger = Logger.new(File.join(RHCHelper::TEMP_DIR, "cucumber.log"))
+  logger = Logger.new(File.join(RHCHelper::TEMP_DIR, "rhc_cucumber.log"))
   logger.level = Logger::DEBUG
   RHCHelper::Loggable.logger = logger
   $logger = logger
@@ -163,7 +173,7 @@ end
 
 After do |s|
   # Tell Cucumber to quit after this scenario is done - if it failed.
-  Cucumber.wants_to_quit = true if s.failed?
+  Cucumber.wants_to_quit = true if s.failed? && !ENV['QUIET']
 end
 
 World(RHCHelper)

data/lib/rhc-common.rb

@@ -384,7 +384,7 @@ end
     rescue Exception => e
       puts "There was a problem communicating with the server. Response message: #{e.message}"
       puts "If you were disconnected it is possible the operation finished without being able to report success."
-      puts "You can use 'rhc domain show' and 'rhc app status' to learn about the status of your user and application(s)."
+      puts "You can use 'rhc domain show' and 'rhc app show --state' to learn about the status of your user and application(s)."
       exit 219
     end
   end
@@ -965,7 +965,10 @@ def config
 end
 
 def ask_password
-  return ask("Password: ") { |q| q.echo = '*' }
+  return ask("Password: ") { |q|
+    q.echo = '*'
+    q.whitespace = :chomp
+  }
 end
 
 def kfile_not_found

data/lib/rhc/cartridge_helpers.rb

@@ -2,7 +2,7 @@ module RHC
   module CartridgeHelpers
 
     def find_cartridge(rest_obj, cartridge_name, type="embedded")
-      carts = rest_obj.find_cartridges :regex => cart_regex(cartridge_name), :type => type
+      carts = find_cartridges(rest_obj, [cartridge_name], type)
 
       if carts.length == 0
         valid_carts = rest_obj.cartridges.collect { |c| c.name if c.type == type }.compact
@@ -21,6 +21,12 @@ module RHC
       carts[0]
     end
 
+    def find_cartridges(rest_obj, cartridge_list, type='embedded')
+      rest_obj.find_cartridges :regex => cartridge_list.collect { |c| cart_regex c }.join('|'), :type => type
+    end
+
+    private
+
     def cart_regex(cart)
       "^#{cart.rstrip}(-[0-9\.]+){0,1}$"
     end

data/lib/rhc/command_runner.rb

@@ -66,7 +66,7 @@ module RHC
           OptionParser::InvalidArgument,
           OptionParser::MissingArgument => e
 
-          help_bindings = CommandHelpBindings.new(active_command, commands, Commander::Runner.instance.options)
+          help_bindings = CommandHelpBindings.new(active_command, commands, self)
           usage = RHC::HelpFormatter.new(self).render_command_syntax(help_bindings)
           RHC::Helpers.error e.message
           say "#{usage}"
@@ -106,7 +106,7 @@ module RHC
             next
           else
             command = command(cmd)
-            help_bindings = CommandHelpBindings.new command, commands, Commander::Runner.instance.options
+            help_bindings = CommandHelpBindings.new command, commands, self
             say help_formatter.render_command help_bindings
           end
         end
@@ -115,7 +115,7 @@ module RHC
   end
 
   class CommandHelpBindings
-    def initialize(command, instance_commands, global_options)
+    def initialize(command, instance_commands, runner)
       @command = command
       @actions = instance_commands.collect do |command_name, command_class|
         next if command_class.summary.nil?
@@ -124,7 +124,11 @@ module RHC
         m and command_name == command_class.name ? {:name => m[1], :summary => command_class.summary || ""} : nil
       end
       @actions.compact!
-      @global_options = global_options
+      @global_options = runner.options
+      @runner = runner
+    end
+    def program(*args)
+      @runner.program *args
     end
   end
 end

data/lib/rhc/commands.rb

@@ -5,6 +5,11 @@ require 'rhc/helpers'
 #  to avoid conflicts and side effects of similar short switches
 module Commander
   class Command
+    attr_accessor :default_action
+    def default_action?
+      default_action.present?
+    end
+
     def parse_options_and_call_procs *args
       return args if args.empty?
       opts = OptionParser.new
@@ -84,6 +89,7 @@ module RHC
           c.description = opts[:description]
           c.summary = opts[:summary]
           c.syntax = opts[:syntax]
+          c.default_action = opts[:default]
 
           (options_metadata = opts[:options] || []).each do |o|
             option_data = [o[:switches], o[:description]].flatten(1)

data/lib/rhc/commands/app.rb

@@ -41,12 +41,15 @@ module RHC::Commands
              ).each { |s| say "  #{s}" }
       end
 
+      raise ArgumentError, "You have named both your main application and your Jenkins application '#{name}'. In order to continue you'll need to specify a different name with --enable-jenkins or choose a different application name." if jenkins_app_name == name && enable_jenkins?
+
+      rest_app, rest_domain = nil
       raise RHC::DomainNotFoundException.new("No domains found. Please create a domain with 'rhc domain create <namespace>' before creating applications.") if rest_client.domains.empty?
 
       rest_domain = rest_client.find_domain(options.namespace)
 
       # check to make sure the right options are set for enabling jenkins
-      jenkins_rest_app = check_jenkins(name, rest_domain) if options.enable_jenkins
+      jenkins_rest_app = check_jenkins(name, rest_domain) if enable_jenkins?
 
       # create the main app
       rest_app = create_app(name, cartridge, rest_domain,
@@ -55,7 +58,7 @@ module RHC::Commands
       # create a jenkins app if not available
       # don't error out if there are issues, setup warnings instead
       begin
-        jenkins_rest_app = setup_jenkins_app(rest_domain) if options.enable_jenkins and jenkins_rest_app.nil?
+        jenkins_rest_app = setup_jenkins_app(rest_domain) if enable_jenkins? and jenkins_rest_app.nil?
       rescue Exception => e
         add_issue("Jenkins failed to install - #{e}",
                   "Installing jenkins and jenkins-client",
@@ -119,9 +122,9 @@ module RHC::Commands
       if issues?
         output_issues(rest_app)
       else
-        results { 
-          rest_app.messages.each { |msg| say msg } 
-          jenkins_rest_app.messages.each { |msg| say msg } if options.enable_jenkins and jenkins_rest_app
+        results {
+          rest_app.messages.each { |msg| say msg }
+          jenkins_rest_app.messages.each { |msg| say msg } if enable_jenkins? and jenkins_rest_app
         }
       end
 
@@ -346,7 +349,7 @@ module RHC::Commands
 
         # Now start checking for DNS
         for i in 0..MAX_RETRIES-1
-          found = host_exists?(host)
+          found = host_exists?(host) || hosts_file_contains?(host)
           break if found
 
           say "    retry # #{i+1} - Waiting for DNS: #{host}"
@@ -386,8 +389,13 @@ module RHC::Commands
         end
       end
 
+      def enable_jenkins?
+        # legacy issue, commander 4.0.x will place the option in the hash with nil value (BZ878407)
+        options.__hash__.has_key?(:enable_jenkins)
+      end
+
       def jenkins_app_name
-        return "jenkins" if options.enable_jenkins == true or options.enable_jenkins == "true"
+        return "jenkins" if options.enable_jenkins == true || options.enable_jenkins == "true" || (enable_jenkins? && options.enable_jenkins.nil?)
         return options.enable_jenkins if options.enable_jenkins.is_a?(String)
         nil
       end

data/lib/rhc/commands/base.rb

@@ -97,7 +97,7 @@ class RHC::Commands::Base
       @rest_client ||= begin
         username = config.username
         unless username
-          username = ask "To connect to #{openshift_server} enter your OpenShift login (email or Red Hat login id): "
+          username = ask "Login to #{openshift_server}: "
           config.config_user(username)
         end
         config.password = config.password || RHC::get_password
@@ -107,8 +107,7 @@ class RHC::Commands::Base
     end
 
     def help(*args)
-      ac = Commander::Runner.instance.active_command
-      Commander::Runner.instance.command(:help).run(ac.name, *args)
+      raise ArgumentError, "Please specify an action to take"
     end
 
     def debug?
@@ -202,6 +201,7 @@ class RHC::Commands::Base
     end
 
     def self.default_action(action)
+      options[:default] = action unless action == :help
       define_method(:run) { |*args| send(action, *args) }
     end
 

data/lib/rhc/commands/cartridge.rb

@@ -163,11 +163,10 @@ module RHC::Commands
     end
 
     summary "Set the scaling range of a cartridge"
-    syntax "<cartridge> [--timeout timeout] [--namespace namespace] [--app app] [--min min] [--max max]"
+    syntax "<cartridge> [--namespace namespace] [--app app] [--min min] [--max max]"
     argument :cart_type, "The name of the cartridge you are reloading", ["-c", "--cartridge cartridge"]
     option ["-n", "--namespace namespace"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
     option ["-a", "--app app"], "Application the cartridge belongs to", :context => :app_context, :required => true
-    option ["--timeout timeout"], "Timeout, in seconds, for the session"
     option ["--min min", Integer], "Minimum scaling value"
     option ["--max max", Integer], "Maximum scaling value"
     def scale(cartridge)
@@ -192,6 +191,83 @@ module RHC::Commands
       0
     end
 
+=begin
+    #  Commenting this out for US2438
+    summary 'View/manipulate storage on a cartridge'
+    syntax '<cartridge> -a app [--show] [--add|--remove|--set amount] [--namespace namespace]'
+    argument :cart_type, "The name of the cartridge", ["-c", "--cartridge cart_type"], :arg_type => :list
+    option ["-n", "--namespace namespace"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-a", "--app app"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["--show"], "Show the current base and additional storage capacity"
+    option ["--add amount"], "Add the indicated amount to the additional storage capacity"
+    option ["--remove amount"], "Remove the indicated amount from the additional storage capacity"
+    option ["--set amount"], "Set the specified amount of additional storage capacity"
+    option ["-f", "--force"], "Force the action"
+    def storage(cartridges)
+      # Make sure that we are dealing with an array (-c param will only pass in a string)
+      # BZ 883658
+      cartridges = [cartridges].flatten
+
+      rest_domain = rest_client.find_domain(options.namespace)
+      rest_app = rest_domain.find_application(options.app)
+
+      # Pull the desired action
+      #
+      actions = options.__hash__.keys & [:show, :add, :remove, :set]
+
+      # Ensure that only zero or one action was selected
+      raise RHC::AdditionalStorageArgumentsException if actions.length > 1
+
+      operation = actions.first || :show
+      amount = options.__hash__[operation]
+
+      # Perform a storage change action if requested
+      if operation == :show
+        results do
+          if cartridges.length == 0
+            display_cart_storage_list rest_app.cartridges
+          else
+            cartridges.each do |cartridge_name|
+              cart = rest_app.find_cartridge(cartridge_name)
+              display_cart_storage_info cart, cart.display_name
+            end
+          end
+        end
+      else
+        raise RHC::MultipleCartridgesException,
+          'Exactly one cartridge must be specified for this operation' if cartridges.length != 1
+
+        rest_cartridge = find_cartridge rest_app, cartridges.first, nil
+        amount = amount.match(/^(\d+)(GB)?$/i)
+        raise RHC::AdditionalStorageValueException if amount.nil?
+
+        # If the amount is specified, find the regex match and convert to a number
+        amount = amount[1].to_i
+        total_amount = rest_cartridge.additional_gear_storage
+
+        if operation == :add
+          total_amount += amount
+        elsif operation == :remove
+          if amount > total_amount && !options.force
+            raise RHC::AdditionalStorageRemoveException
+          else
+            total_amount = [total_amount - amount, 0].max
+          end
+        else
+          total_amount = amount
+        end
+
+        cart = rest_cartridge.set_storage(:additional_gear_storage => total_amount)
+        results do
+          say "Success: additional storage space set to #{total_amount}GB\n"
+          display_cart_storage_info cart
+        end
+      end
+
+      0
+    end
+=end
+
     private
       include RHC::CartridgeHelpers
 

data/lib/rhc/commands/port-forward.rb

@@ -2,11 +2,74 @@ require 'rhc/commands/base'
 require 'uri'
 
 module RHC::Commands
+  class ForwardingSpec
+    include RHC::Helpers
+    include Enumerable
+    # class to represent how SSH port forwarding should be performed
+    attr_accessor :port_from
+    attr_reader :remote_host, :port_to, :host_from, :service
+    attr_writer :bound
+
+    def initialize(service, remote_host, port_to, port_from = nil)
+      @service     = service
+      @remote_host = remote_host
+      @port_to     = port_to
+      @host_from   = mac? ? "localhost" : remote_host # forward locally on a Mac
+      @port_from   = port_from || port_to # match ports if possible
+      @bound       = false
+    end
+
+    def to_cmd_arg
+      # string to be used in a direct SSH command
+      mac? ? "-L #{port_from}:#{remote_host}:#{port_to}" : "-L #{remote_host}:#{port_from}:#{remote_host}:#{port_to}"
+    end
+
+    def to_fwd_args
+      # array of arguments to be passed to Net::SSH::Service::Forward#local
+      args = [port_from.to_i, remote_host, port_to.to_i]
+      args.unshift(remote_host) unless mac?
+      args
+    end
+
+    def bound?
+      @bound
+    end
+
+    # :nocov: These are for sorting. No need to test for coverage.
+    def <=>(other)
+      if bound? && !other.bound?
+        -1
+      elsif !bound? && other.bound?
+        1
+      else
+        order_by_attrs(other, :service, :remote_host, :port_from)
+      end
+    end
+
+    def order_by_attrs(other, *attrs)
+      # compare self and "other" by examining their "attrs" in order
+      # attrs should be an array of symbols to which self and "other"
+      # respond when sent.
+      while attribute = attrs.shift do
+        if self.send(attribute) != other.send(attribute)
+          return self.send(attribute) <=> other.send(attribute)
+        end
+      end
+      0
+    end
+    # :nocov:
+
+    private :order_by_attrs
+  end
+
   class PortForward < Base
 
-    IP_AND_PORT = /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\:[0-9]{1,5}/
+    UP_TO_256 = /25[0-5]|2[0-4][0-9]|[01]?(?:[0-9][0-9]?)/
+    UP_TO_65535 = /6553[0-5]|655[0-2][0-9]|65[0-4][0-9][0-9]|6[0-4][0-9][0-9][0-9]|[0-5]?(?:[0-9][0-9]{0,3})/
+    IP_AND_PORT = /\b(#{UP_TO_256}(?:\.#{UP_TO_256}){3})\:(#{UP_TO_65535})\b/
 
     summary "Forward remote ports to the workstation"
+    syntax "<application>"
     option ["-n", "--namespace namespace"], "Namespace of the application you are port forwarding to", :context => :namespace_context, :required => true
     argument :app, "Application you are port forwarding to (required)", ["-a", "--app app"]
     def run(app)
@@ -14,45 +77,91 @@ module RHC::Commands
       rest_domain = rest_client.find_domain options.namespace
       rest_app = rest_domain.find_application app
 
-      raise RHC::ScaledApplicationsNotSupportedException.new "This utility does not currently support scaled applications. You will need to set up port forwarding manually." if (rest_app.embedded.keys.any?{ |k| k =~ /\Ahaproxy/ })
-
       ssh_uri = URI.parse(rest_app.ssh_url)
       say "Using #{rest_app.ssh_url}..." if options.debug
 
-      hosts_and_ports = []
-      hosts_and_ports_descriptions = []
+      forwarding_specs = []
 
       begin
-
         say "Checking available ports..."
 
         Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
-
           ssh.exec! "rhc-list-ports" do |channel, stream, data|
             if stream == :stderr
               data.each_line do |line|
                 line.chomp!
+                # FIXME: This is really brittle; there must be a better way
+                # for the server to tell us that permission (what permission?)
+                # is denied.
                 raise RHC::PermissionDeniedException.new "Permission denied." if line =~ /permission denied/i
-                hosts_and_ports_descriptions << line if line.index(IP_AND_PORT)
+                # ...and also which services are available for the application
+                # for us to forward ports for.
+                if line =~ /\A\s*(\S+) -> #{IP_AND_PORT}/
+                  debug fs = ForwardingSpec.new($1, $2, $3.to_i)
+                  forwarding_specs << fs
+                else
+                  debug line
+                end
+
               end
+            end
+          end
+          
+          if forwarding_specs.length == 0
+            # check if the gears have been stopped
+            ggs = rest_app.gear_groups
+            if ggs.any? { |gg|
+              gears = gg.gears
+              true if gears.any? { |g| g["state"] == "stopped" }
+            }
+              warn "Application #{rest_app.name} is stopped. Please restart the application and try again."
+              return 1
             else
-              data.each_line do |line|
-                line.chomp!
-                hosts_and_ports << line if ((not line =~ /scale/i) and IP_AND_PORT.match(line))
-              end
+              raise RHC::NoPortsToForwardException.new "There are no available ports to forward for this application. Your application may be stopped." 
             end
           end
 
-          raise RHC::NoPortsToForwardException.new "There are no available ports to forward for this application. Your application may be stopped." if hosts_and_ports.length == 0
-
-          hosts_and_ports_descriptions.each { |description| say "Binding #{description}..." }
-
           begin
             Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
-              say "Forwarding ports, use ctl + c to stop"
-              hosts_and_ports.each do |host_and_port|
-                host, port = host_and_port.split(/:/)
-                ssh.forward.local(host, port.to_i, host, port.to_i)
+              say "Forwarding ports"
+              forwarding_specs.each do |fs|
+                given_up = nil
+                while !fs.bound? && !given_up
+                  begin
+                    args = fs.to_fwd_args
+                    debug args.inspect
+                    ssh.forward.local(*args)
+                    fs.bound = true
+                  rescue Errno::EADDRINUSE
+                    debug "trying local port #{fs.port_from}"
+                    fs.port_from += 1
+                  rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
+                    given_up = true
+                  end
+                end
+              end
+
+              bound_ports = forwarding_specs.select(&:bound?)
+              if bound_ports.length > 0
+                items = bound_ports.map do |fs|
+                  [fs.service, "#{fs.host_from}:#{fs.port_from}", " => ", "#{fs.remote_host}:#{fs.port_to.to_s}"]
+                end
+                table(items, :header => ["Service", "Connect to", "    ", "Forward to"]).each { |s| success "  #{s}" }
+              end
+
+              # for failed port forwarding attempts
+              failed_port_forwards = forwarding_specs.select { |fs| !fs.bound? }
+              if failed_port_forwards.length > 0
+                ssh_cmd_arg = failed_port_forwards.map { |fs| fs.to_cmd_arg }.join(" ")
+                ssh_cmd = "ssh -N #{ssh_cmd_arg} #{ssh_uri.user}@#{ssh_uri.host}"
+                warn "Error forwarding some port(s). You can try to forward manually by running:\n#{ssh_cmd}"
+              else
+                say "Press CTRL-C to terminate port forwarding"
+              end
+
+              unless forwarding_specs.any?(&:bound?)
+                warn "No ports have been bound"
+                return
               end
               ssh.loop { true }
             end
@@ -64,13 +173,17 @@ module RHC::Commands
         end
 
       rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
-        ssh_cmd = "ssh -N "
-        hosts_and_ports.each { |port| ssh_cmd << "-L #{port}:#{port} " }
-        ssh_cmd << "#{ssh_uri.user}@#{ssh_uri.host}"
-        raise RHC::PortForwardFailedException.new("#{e.message if options.debug}\nError trying to forward ports. You can try to forward manually by running:\n" + ssh_cmd)
+        ssh_cmd = ["ssh","-N"]
+        unbound_fs = forwarding_specs.select { |fs| !fs.bound? }
+        ssh_cmd += unbound_fs.map { |fs| fs.to_cmd_arg }
+        ssh_cmd += ["#{ssh_uri.user}@#{ssh_uri.host}"]
+        raise RHC::PortForwardFailedException.new("#{e.message + "\n" if options.debug}Error trying to forward ports. You can try to forward manually by running:\n" + ssh_cmd.join(" "))
       end
 
       return 0
+    rescue RestClient::Exception => e
+      error "Connection to #{openshift_server} failed: #{e.message}"
+      return 1
     end
   end
 end