openshift 0.60.3

data/Error codes.txt

@@ -0,0 +1,15 @@
+-1: ^C quit
+
+-100: Error parsing arguments
+-101: Missing parameters
+
+-200: object not found
+-201: Multiple objects with same name. Ambiguous choice
+-218: Server not reachable
+-219: Incomplete operation
+
+-300: Unknown server communication error
+-301: Generic server side error
+
+-400: Error parsing data from sub-command
+-401: Invalid credentials

data/bin/os

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# Copyright 2010 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'openshift'
+
+print "Redhat Openshift Cloud Platform\n\n"
+
+begin
+    command = ARGV.shift
+    cmdArgs = ["os-#{command.downcase}"] + ARGV
+    cmd = cmdArgs.join(' ')
+    exec( cmd )
+rescue Exception => e
+    print e
+    exec( "os-help" )
+end
+
+
+
+
+
+    

data/bin/os-add-cartridge

@@ -0,0 +1,190 @@
+#!/usr/bin/env ruby
+# Copyright 2010 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'openshift'
+
+def usage
+    puts <<USAGE
+== Synopsis
+
+os-add-cartridge: Adds a software cartridge and loads initial configuration 
+into the application.
+
+== Usage
+
+os add-cartridge [options] APP CARTRIDGES
+
+-u|--username USERNAME:
+   Redhat Login (RHN or OpenShift login with OpenShift Flex access).
+
+-p|--password PASSWORD:
+   Redhat Password.
+
+-e|--environment ID:
+   The ID of the environment that is hosting the application. This is an optional
+   argument to disambiguate the application name.
+
+-h|--help:
+   Prints this message
+
+APP: The application name or application GUID
+
+CARTRIDGES: Comma seperated list of cartridges to add to the application
+USAGE
+end
+
+opts = GetoptLong.new(
+    ["--username",         "-u", GetoptLong::REQUIRED_ARGUMENT],
+    ["--password",         "-p", GetoptLong::REQUIRED_ARGUMENT],
+    ["--environment",      "-e", GetoptLong::REQUIRED_ARGUMENT],
+    ["--debug",                  GetoptLong::NO_ARGUMENT],
+    ["--help",             "-h", GetoptLong::NO_ARGUMENT],
+    ["--sso",                    GetoptLong::REQUIRED_ARGUMENT],
+    ["--target",           "-t", GetoptLong::REQUIRED_ARGUMENT]        
+)
+args = {}
+begin
+    opts.each{ |k,v| args[k]=v }
+rescue GetoptLong::Error => e
+    usage
+    exit -100
+end
+
+flex_server = conf('flex_server')
+app_name = ARGV.shift
+environment_id = args['--environment']
+@debug = true if args['--debug']
+carts = ARGV.shift
+
+if args['--help'] or app_name.nil? or app_name == "" or carts.nil? or carts == ""
+    usage
+    exit -101
+end
+
+args['--target'] = conf('default_target') || 'flex' if args['--target'].nil? or args['--target']==""
+debug args['--target']
+
+if args['--target'] == 'flex'
+    cookie = args['--sso']
+    if !cookie
+        username = args['--username'] || conf("username") || Openshift::IO.prompt("Redhat username",[],Openshift::Validation.method(:check_login))
+        password = args['--password'] || Openshift::IO.prompt("Redhat password",nil,nil,true,false)
+        csay("Logging into Openshift Flex as #{username}\n",:message)
+        cookie=Openshift.login(@http,username,password)
+    end
+    
+    candidates=nil
+    begin
+        environment_info = "--environment #{environment_id}" if environment_id
+        debug "Invoking os-inspect-application --sso \"#{cookie}\" --porcelin #{environment_info} #{app_name}"
+        candidates = JSON.parse(`os-inspect-application --sso \"#{cookie}\" --porcelin #{environment_info} #{app_name}`)
+    rescue JSON::ParserError => e
+        debug e.message
+        csay("Unable to load application data from server\n.",:error)
+        exit -400
+    end
+    
+    if candidates.size == 0
+        csay("No application found with specified name or guid.\n",:error)
+        usage
+        exit -200
+    end
+    
+    if candidates.size > 1
+        csay("Ambiguous application. Please consider specifing environment id and/or application guid.\n",:warn)
+        usage
+        exit -201
+    end
+    
+    environment = candidates[0]["environment"]
+    app = candidates[0]["application"]
+    
+    cart_data = nil
+    begin
+        debug "Invoking os-list-cartridges --sso \"#{cookie}\" --porcelin --environment #{environment["id"]} #{app["guid"]}"
+        cart_data = JSON.parse(`os-list-cartridges --sso "#{cookie}" --porcelin --environment #{environment['id']} #{app['guid']}`)
+    rescue JSON::ParserError => e
+        debug e.message
+        csay("Unable to retrieve a list of cartridges from the server\n.",:error)
+        exit -400
+    end
+    
+    avail = cart_data['available']
+    installed = cart_data['installed']
+
+    debug "hi 1\n"
+    
+    carts_to_install = []
+    new_carts = carts.split(",")
+    new_carts.each{ |ncart|
+        cart_obj = nil
+        avail.each{ |cart|
+            if cart["name"] == ncart
+                cart_obj = cart
+                break
+            end
+        }
+        if cart_obj
+            debug "Adding cart:"
+            debug cart_obj
+            carts_to_install += [cart_obj]
+        else
+            csay("Unknown cartridge #{ncart}. Please verify the name against the list of available cartridges\n",:warn)
+        end
+    }
+    
+    say("Configuring dependencies for application ")
+    csay("#{app['name']} ",:emphasis)
+    say("... ")
+    uri = URI.parse("https://#{environment['dns']}:4242/applications/#{app['guid']}/cartridges")
+    response = Openshift::Rest.put(@http, uri, { "cartridges" => JSON.generate(carts_to_install+installed) },
+            nil, {'user' => environment['username'], 'password' => environment['password']})
+    case response
+    when Net::HTTPSuccess
+        csay("[OK]",:conf)
+    else
+        debug "HTTP code: #{response.code}"
+        debug response.body
+        csay("[ERROR]",:error)
+        messages = JSON.parse(response.body)
+        csay("Unable to set application cartridges due to error. Message: #{messages['messages'][0]['description']}",:error)
+        exit -301
+    end
+
+    say("Committing changes to git... ")    
+    uri = URI.parse("https://#{environment['dns']}:4242/applications/#{app['guid']}/tree/.vostok/revisions")
+    response = Openshift::Rest.post(@http, uri, {"untracked" => "true"}, nil, {'user' => environment['username'], 'password' => environment['password']})
+    case response
+    when Net::HTTPSuccess
+        csay("[OK]",:conf)
+    else
+        debug "HTTP code: #{response.code}"
+        debug response.body
+        csay("[ERROR]",:error)
+        messages = JSON.parse(response.body)
+        csay("Unable to commit configuration file changes. Message: #{messages['messages'][0]['description']}",:error)
+        exit -301
+    end
+else
+    csay("Application dependencies can only be added for the Openshift Flex application.\n",:red)    
+end

data/bin/os-clone-application

@@ -0,0 +1,175 @@
+#!/usr/bin/env ruby
+# Copyright 2010 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'openshift'
+
+def usage
+    puts <<USAGE
+== Synopsis
+
+os-clone-application: Clone the application repository into a new directory.
+
+== Usage
+
+os clone-application [options] APP [DIR]
+
+-u|--username USERNAME:
+   Redhat Login (RHN or OpenShift login).
+
+-p|--password PASSWORD:
+   Redhat Password.
+
+-t|--target flex|express
+   Choose the cloud platform to clone the application from.
+
+-e|--environment ID:
+   The ID of the environment that is hosting the application. This is an optional 
+   argument to disambiguate the application name. This argument only applies 
+   to Openshift Flex environments
+
+-h|--help:
+   Prints this message
+
+APP: The application name or application GUID
+
+DIR: Directory to clone application into    
+USAGE
+end
+
+opts = GetoptLong.new(
+    ["--username",         "-u", GetoptLong::REQUIRED_ARGUMENT],
+    ["--password",         "-p", GetoptLong::REQUIRED_ARGUMENT],
+    ["--environment",      "-e", GetoptLong::REQUIRED_ARGUMENT],        
+    ["--help",             "-h", GetoptLong::NO_ARGUMENT],        
+    ["--debug",                  GetoptLong::NO_ARGUMENT],    
+    ["--sso",                    GetoptLong::REQUIRED_ARGUMENT],
+    ["--target",           "-t", GetoptLong::REQUIRED_ARGUMENT]
+)
+
+args = {}
+begin
+    opts.each{ |k,v| args[k]=v }
+rescue GetoptLong::Error => e
+    usage
+    exit -100
+end
+
+app_name = ARGV.shift
+clone_dir = ARGV.shift
+@debug = true if args['--debug']
+
+if args['--help'] or app_name.nil? or app_name == ""
+    usage
+    exit -101
+end
+
+args['--target'] = conf('default_target') || 'flex' if args['--target'].nil? or args['--target']==""
+debug args['--target']
+
+if args['--target'] == 'flex'
+    flex_server = conf('flex_server')
+    environment_id = args['--environment']
+    cookie = args['--sso']
+    
+    if !cookie
+        username = args['--username'] || conf("username") || Openshift::IO.prompt("Redhat username",[],Openshift::Validation.method(:check_login))
+        password = args['--password'] || Openshift::IO.prompt("Redhat password",nil,nil,true,false)
+        csay("Logging into Openshift Flex as #{username}\n",:message)
+        cookie=Openshift.login(@http,username,password)
+    end
+
+    candidates=nil
+    begin
+        environment_info = "--environment #{environment_id}" if environment_id
+        debug "Invoking os-inspect-application --sso \"#{cookie}\" --porcelin #{environment_info} #{app_name}"    
+        candidates = JSON.parse(`os-inspect-application --sso \"#{cookie}\" --porcelin #{environment_info} #{app_name}`)
+    rescue JSON::ParserError => e
+        debug e.message
+        csay("Unable to load application data from server\n.",:error)
+        exit -400
+    end
+
+    if candidates.size == 0
+        csay("No application found with specified name or guid.\n",:error)
+        usage
+        exit -200
+    end
+
+    if candidates.size > 1
+        csay("Ambiguous application. Please consider specifing environment id and/or application guid.\n",:error)
+        usage
+        exit -201
+    end
+    
+    environment = candidates[0]["environment"]
+    app = candidates[0]["application"]
+    
+    clone_dir = app['name'] if clone_dir.nil? or clone_dir == ""
+    
+    if not File.readable?(@libra_kfile)
+        csay("Generating OpenShift Express ssh key to #{@libra_kfile}",:message)
+        debug "Invoking ssh-keygen -t rsa -f '#{@libra_kfile}'"
+        system("ssh-keygen -t rsa -f '#{@libra_kfile}'")
+    end
+    ssh_key = File.open(@libra_kpfile).gets.chomp.split(' ')[1]
+
+    csay("\nRetrieving environment SSH keys... ")
+    uri = URI.parse("https://#{environment['dns']}:4242/security/keys")
+    response = Openshift::Rest.get(@http, uri, nil, nil, {'user' => environment['username'], 'password' => environment['password']})
+    case response
+    when Net::HTTPSuccess
+        csay("[OK]",:conf)
+    else
+        debug "HTTP code: #{response.code}"
+        debug response.body
+        csay("[ERROR]",:error)
+        csay("Unable to retrieve environment ssh-keys. Message: #{data['error']}",:error)
+        exit -301
+    end
+    
+    data = nil
+    data = JSON.parse(response.body)
+    keys = data['keys']
+    if not keys.index(ssh_key)
+        csay("\nUploading ssh-key to environment... ")
+        uri = URI.parse("https://#{environment['dns']}:4242/security/keys")
+        response = Openshift::Rest.post(@http, uri, {'type'=>'ssh-rsa','identifier'=>'', 'key'=>ssh_key}, nil, {'user' => environment['username'], 'password' => environment['password']})
+        case response
+        when Net::HTTPSuccess
+            csay("[OK]",:conf)
+        else
+            debug "HTTP code: #{response.code}"
+            debug response.body
+            csay("[ERROR]",:error)
+            csay("Unable to update ssh keys on environment. Please use environment admin password when prompted below",:error)
+        end
+    end
+    
+    csay("Cloning application ")
+    csay("#{app['name']} ",:emphasis)
+    csay("to directory ")    
+    csay("#{clone_dir}",:emphasis)    
+    Openshift::Git.clone("ssh://admin@#{environment['dns']}/mnt/glusterfs/web-apps/#{app['guid']}/repository",clone_dir,'flex')
+else
+    csay("This feature is currently not implemented for Openshift Express applications.\n",:red)    
+end 

data/bin/os-create-application

@@ -0,0 +1,306 @@
+#!/usr/bin/env ruby
+# Copyright 2010 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'openshift'
+
+def usage
+puts <<USAGE
+== Synopsis
+
+os-create-application: Creates a new application on an exisitng environemnt.
+
+== Usage
+
+os create-application [options] [NAME] [CHECKOUT_DIR]
+
+-u|--username
+   Redhat Login (RHN or OpenShift login with OpenShift Express access)
+
+-p|--password
+   Redhat Password
+
+-t|--target flex|express
+   Choose the cloud platform to create the application on.
+
+-v|--version
+   Version string for application (alpha numeric, default: 1.0)
+
+-m|--template TEMPLATE
+   Sets up basic cartridges for the application.
+   Flex: #{Openshift::Flex.templates.keys.join(", ")}
+
+-c|--environment CLUSTER_ID:
+   The ID of the environment that will host the application.
+
+--import-archive FILE
+   Import an existing VPM file or compressed application artifacts.
+
+-n|--no-git
+   Disables git clone of application files.
+
+-h|--help
+   Prints this message
+
+NAME: The name of the new application
+CHECKOUT_DIR: The directory to clone the application into
+USAGE
+end
+
+def create_flex_environment(args,cookie)
+    args.delete('--target')
+    args.delete('--username')
+    args.delete('--password')
+    args.delete('--environment')
+    args.delete('--sso')            
+    args = JSON.generate(args)
+    args.gsub!(/(["\\])/, '\\\\\1')
+    exec( "os-create-environment --target flex --sso \"#{cookie}\" --new-application \"#{args}\"" )
+end
+
+begin
+    opts = GetoptLong.new(
+        ["--username",         "-u", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",         "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--sso",                    GetoptLong::REQUIRED_ARGUMENT],
+        ["--environment",      "-e", GetoptLong::REQUIRED_ARGUMENT],        
+        ["--target",           "-t", GetoptLong::REQUIRED_ARGUMENT],
+        ["--version",          "-v", GetoptLong::REQUIRED_ARGUMENT],
+        ["--template",         "-m", GetoptLong::REQUIRED_ARGUMENT],
+        ["--no-git",           "-n", GetoptLong::NO_ARGUMENT],
+        ["--import-archive",   "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--debug",                  GetoptLong::NO_ARGUMENT],                  
+        ["--help",             "-h", GetoptLong::NO_ARGUMENT]
+    )
+rescue Exception => e
+    puts e.message
+end
+
+args = {}
+begin
+    opts.each{ |k,v| args[k]=v }
+rescue GetoptLong::Error => e
+    usage
+    exit -100
+end
+
+if args['--help']
+    usage
+    exit
+end
+
+app_name = ARGV.shift
+clone_dir = ARGV.shift
+@debug = true if args['--debug']
+debug "Application name: #{app_name}, Clone dir: #{clone_dir}"
+
+args['--target'] = conf('default_target') || 'flex' if args['--target'].nil? or args['--target']==""
+debug "Target platform #{args['--target']}"
+
+if args['--target'] == 'flex'
+    flex_server = conf('flex_server')
+    cookie = args['--sso']
+    if !cookie
+        username = args['--username'] || conf("username") || Openshift::IO.prompt("Redhat username",[],Openshift::Validation.method(:check_login))
+        password = args['--password'] || Openshift::IO.prompt("Redhat password",nil,nil,true,false)
+        csay("Logging into Openshift Flex as #{username}\n",:message)
+        cookie=Openshift.login(@http,username,password)
+    end
+    
+    environment_id = args['--environment']
+    environments = JSON.parse(`os-list-environments --sso "#{cookie}" --porcelin`)
+    if not environment_id
+        if environments.size == 0
+            csay("You have no existing environments, this wizard will help you create a cloud and Flex environment to host your applications\n", :message)
+            create_flex_environment(args,cookie)
+        end
+        
+        menu = environments + [{'id'=>"n", 'name'=>'New envionment'}] 
+        csay("Select an envionment to host the new application or select 'n' to create a new envionment", :message)
+        Openshift::Formatter.table(["Environment Id","Name","Cloud", "DNS", "Load balancer", "Location", "State", "# Nodes"],
+              ['id','name','cloud-account-name', 'dns', 'load-balancer-address','location','cluster-status','num-nodes'],
+              [16,15,20,40,20,15,10,10],
+              menu)
+        environment_id = Openshift::IO.prompt("Environment Id", menu.map{|c| c['id'].to_s})
+    end
+    create_flex_environment(args,cookie) if environment_id.downcase == 'n'
+    environment = environments.find_all{|c| c['id'].to_s == environment_id.to_s}[0]
+    environment_dns = environment['dns']
+    
+    ssh_key = Openshift::SSH::gen_ssh_keys(@libra_kfile,@libra_kpfile)
+    Openshift::SSH::setup_ssh_config(conf('domain'))
+    csay("\nRetrieving environment SSH keys... ")    
+    uri = URI.parse("https://#{environment['dns']}:4242/security/keys")
+    response = Openshift::Rest.get(@http, uri, nil, nil, {'user' => environment['username'], 'password' => environment['password']})
+    case response
+    when Net::HTTPSuccess
+        csay("[OK]",:conf)
+    else
+        debug "HTTP code: #{response.code}"
+        debug response.body
+        csay("[ERROR]",:error)
+        csay("Please verify your cloud credentials and try again.\n",:red)
+        exit -301
+    end
+    
+    data = JSON.parse(response.body)
+    keys = data['keys']
+    if not keys.index(ssh_key)
+        csay("Uploading SSH key to environment... ")
+        uri = URI.parse("https://#{environment['dns']}:4242/security/keys")
+        response = Openshift::Rest.post(@http, uri, {'type'=>'ssh-rsa','identifier'=>'', 'key'=>ssh_key}, nil, {'user' => environment['username'], 'password' => environment['password']})
+        case response
+        when Net::HTTPSuccess
+            csay("[OK]",:conf)
+        else
+            debug "HTTP code: #{response.code}"
+            debug response.body
+            csay("[ERROR]",:error)
+            csay("Unable to update ssh keys on environment.",:error)
+            exit -301
+        end
+    end
+
+    response = nil
+    vpm_imported = false
+    if args['--import-archive'] and (args['--import-archive'] =~ /vpm$/)
+        file_name = args['--import-archive']        
+        csay("Importing application vpm ")
+        csay("#{file_name} ", :emphasis)
+        csay("... ")
+        uri = URI.parse("https://#{environment_dns}:4242/applications")
+        response = Openshift::Rest.postFile(@http, uri, nil, {"package"=>file_name}, nil, {'user' => environment['username'], 'password' => environment['password']})
+        case response        
+        when Net::HTTPSuccess
+            csay("[OK]",:conf)
+        else
+            debug "HTTP code: #{response.code}"
+            debug response.body
+            csay("[ERROR]",:error)
+            csay("Unable to upload VPM archive",:error)
+            exit -301
+        end
+        vpm_imported = true
+    else
+        if not Openshift::Validation.check_field(app_name,"application name",8)
+            app_name = Openshift::IO.prompt("Application name",[],lambda{|a| Openshift::Validation.check_field(a,"application name",8)})
+        end
+        app_version = args['--version'] || "1.0"    
+        csay("Creating application ")
+        csay("#{app_name} ", :emphasis)
+        csay("Version:#{app_version})... ")
+        uri = URI.parse("https://#{environment_dns}:4242/applications")
+        response = Openshift::Rest.post(@http, uri, {"name" => app_name, "version" => app_version}, nil, {'user' => environment['username'], 'password' => environment['password']})
+        case response
+        when Net::HTTPSuccess
+            csay("[OK]",:conf)
+        else
+            debug "HTTP code: #{response.code}"
+            debug response.body
+            csay("[ERROR]",:error)
+            csay("Unable to create new application",:error)
+            exit -301
+        end
+    end
+    data = JSON.parse(response.body)    
+    app = data['application']
+    
+    if not vpm_imported and args['--import-archive']
+        #some other type of archive
+        file_name = args['--import-archive']         
+        csay("Uploading archive ")
+        csay("#{file_name} ",:emphasis)
+        csay("to server... ")
+        uri = URI.parse("https://#{environment_dns}:4242/applications/#{app['guid']}/tree/")
+        response = Openshift::Rest.postFile(@http, uri,{"operation"=>"extract"},{"archive"=>file_name},
+                nil, {'user' => environment['username'], 'password' => environment['password']})
+        case response        
+        when Net::HTTPSuccess
+            csay("[OK]",:conf)
+        else
+            debug "HTTP code: #{response.code}"
+            debug response.body
+            csay("[ERROR]",:error)
+            csay("Unable to create upload archive.",:error)
+            exit -301
+        end
+    end
+    
+    if not vpm_imported
+        template = args['--template'] || Openshift::IO.prompt("Choose an application template",Openshift::Flex.templates.keys)
+        carts=Openshift::Flex.templates[template]
+        csay("Retrieving list of available cartridges... ")
+        cart_data = nil
+        begin
+            cmd = "os-list-cartridges --sso \"#{cookie}\" --porcelin --environment #{environment["id"]} #{app["guid"]}"
+            debug cmd
+            cart_data = JSON.parse(`#{cmd}`)
+            csay("[OK]",:conf)
+        rescue Exception => e
+            debug cart_data
+            debug e.message
+            csay("[ERROR]",:error)
+            csay("Unable to retrieve available cartridges",:error)
+            exit -400
+        end
+        avail = cart_data['available']
+        carts_to_install=[]                                                                                                                                                                                                                          
+        avail.each{ |cart|                                                                                                                                                                                                              
+            carts.each{ |req|                                                                                                                                                                                                           
+                if cart["name"].index(req) == 0                                                                                                                                                                                         
+                    carts_to_install += [cart["name"]]                                                                                                                                                                                               
+                end                                                                                                                                                                                                                     
+            }                                                                                                                                                                                                                           
+        }
+        csay("Installing cartridges: #{carts_to_install.join(",")}")
+        system( "os-add-cartridge --sso \"#{cookie}\" --environment #{environment['id']} #{app['guid']} #{carts_to_install.join(",")}" )
+    else
+        system("Ignoring template argument since VPM archive includes dependency information",:warn) if args["--template"]
+    end
+    
+    if not args['--no-git'] 
+        if not vpm_imported and Openshift::Git.git_repo? and Openshift::IO.prompt("A git repository has been detected. Import this application? [Yn]",['Y','y','N','n']).downcase == 'y'
+            csay("Adding GIT remote 'flex' to existing repository",:message)
+            Openshift::Git.add_remote("ssh://admin@#{environment_dns}/mnt/glusterfs/web-apps/#{app['guid']}/repository","flex")
+            Openshift::Git.pull("flex")
+        else
+            clone_dir = app['name'] if clone_dir.nil? or clone_dir == ""
+            csay("Cloning application ")
+            csay("#{app['name']} ",:emphasis)
+            csay("to directory ")    
+            csay("#{clone_dir}",:emphasis)
+            Openshift::Git.clone("ssh://admin@#{environment_dns}/mnt/glusterfs/web-apps/#{app['guid']}/repository",app['name'],'origin')
+        end
+    end
+
+    if args['--porcelin']
+        print JSON.generate(app)
+    else
+        csay("Application created",:message)
+        Openshift::Formatter.table(["Application GUID","Application name", "Version", "State"],
+              ['guid','name','version','status'],
+              [39,20,7,10],
+              [app])
+    end
+else #express
+    csay("This feature is currently not implemented for Openshift Express applications.\n",:red)       
+end