vagrant-openshift 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cbead9fef9d999bd787d5c5235398207ecf3fb
-  data.tar.gz: d55a4db0100f1aca956fbaaff81828cb922f8110
+  metadata.gz: 53f42ad6eeea81faac5dc4094f66c540759b5276
+  data.tar.gz: c6f5b108e6fea0f10d3023204ae3bf44e78051bc
 SHA512:
-  metadata.gz: 4a9234f05f04cba7415dd7ef94457ae166609c0b747a571875f938e4ff3a984b3eb8cb28176fbc2d1d2accaa153432e419b2fa780c7526469b7e9c1faa511679
-  data.tar.gz: 7e514acfc0c3d39cdebfcbc0a76ac6632820ed643415bc82ce65958d1379d276e07eeb52dbf4eac606523472338245f5dba0c585945bea6976d6a56f86ad6ddc
+  metadata.gz: 10b73600f020405ff442a623b791af60cee555d494cead79959fac324c3ef5bb409937f46bfb80298c82a6f8a13bf35b07eab8d65f29c8d30b6dbfd82e86f245
+  data.tar.gz: 78059996e90d5fdc8ca322c4c3c03f9ba11844f54de8de83553c71df7a928ad786c9fb81d4dc2818cb5a53adfb0682dcf1d777da54bd618d0e7a356d1230b061

data/README.asciidoc

@@ -37,7 +37,7 @@ $ rake vagrant:install
 
 ==== Clone the OpenShift Origin repositories
 
-===== OpenShift 3
+===== Geard
 
 [source, sh]
 ----
@@ -70,7 +70,7 @@ $ vagrant origin-init <instance name>
 .Command options:
 
 * Specify which OS to build with:
-** --os fedora		- Launch a Fedora 20 image (used for OpenShift 3 development)
+** --os fedora		- Launch a Fedora 20 image (used for Geard development)
 ** --os rhel6		- Launch a RHEL 6 image (where available)
 ** --os centos6		- Launch a CentOS 6 image (where available, used for OpenShift 2.x development)
 
@@ -104,7 +104,7 @@ Note: See Other Environments below for launching against other options.
 
 * Syncing and building code from local repository clones
 
-===== OpenShift 3
+===== Geard
 
 [source, sh]
 ----
@@ -122,7 +122,7 @@ $ vagrant sync
 
 ==== Running OpenShift Origin Tests
 
-===== OpenShift 3
+===== Geard
 
 [source, sh]
 ----
@@ -143,14 +143,12 @@ $ vagrant test --all
 
 If starting from --stage os, install the build and package dependencies.
 
-===== OpenShift 3
+===== Geard
 
 [source, sh]
 ----
 $ vagrant build-geard-base
 $ vagrant install-geard
-$ vagrant build-geard-broker
-$ vagrant install-geard-broker
 ----
 
 ===== OpenShift 2.x

data/lib/vagrant-openshift/action.rb

@@ -60,12 +60,6 @@ module Vagrant
         end
       end
 
-      def self.install_geard_broker(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use InstallGeardBroker
-        end
-      end
-
       def self.build_geard(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use BuildGeard
@@ -78,30 +72,6 @@ module Vagrant
         end
       end
 
-      def self.restart_geard_broker(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use RestartGeardBroker
-        end
-      end
-
-      def self.build_geard_broker(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildGeardBroker, options
-        end
-      end
-
-      def self.restart_geard_console(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use RestartGeardConsole
-        end
-      end
-
-      def self.build_geard_console(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildGeardConsole, options
-        end
-      end      
-
       def self.build_geard_images(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use BuildGeardImages, options
@@ -152,10 +122,6 @@ module Vagrant
             b.use BuildGeard if options[:include].include? Vagrant::Openshift::Constants::FILTER_GEARD
             b.use RestartGeard if options[:include].include? Vagrant::Openshift::Constants::FILTER_GEARD
             b.use BuildGeardImages, options if options[:include].include? Vagrant::Openshift::Constants::FILTER_IMAGES
-            b.use BuildGeardBroker if options[:include].include? Vagrant::Openshift::Constants::FILTER_BROKER
-            b.use RestartGeardBroker if options[:include].include? Vagrant::Openshift::Constants::FILTER_BROKER
-            b.use BuildGeardConsole if options[:include].include? Vagrant::Openshift::Constants::FILTER_CONSOLE
-            b.use RestartGeardConsole if options[:include].include? Vagrant::Openshift::Constants::FILTER_CONSOLE
             b.use InstallRhc if options[:include].include? Vagrant::Openshift::Constants::FILTER_RHC
           end
         end
@@ -247,12 +213,6 @@ module Vagrant
       def self.install_rhc(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use InstallRhc
-        end        
-      end
-
-      def self.setup_geard_broker(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use SetupGeardBroker
         end
       end
 
@@ -269,17 +229,12 @@ module Vagrant
       autoload :YumUpdate, action_root.join("yum_update")
       autoload :SetupBuilderFiles, action_root.join("setup_builder_files")
       autoload :InstallBuildDependencies, action_root.join("install_build_dependencies")
-      autoload :BuildGeardBroker, action_root.join("build_geard_broker")
-      autoload :BuildGeardConsole, action_root.join("build_geard_console")
       autoload :BuildGeardImages, action_root.join("build_geard_images")
       autoload :InstallGeardBaseDependencies, action_root.join("install_geard_base_dependencies")
       autoload :InstallGeardImages, action_root.join("install_geard_images")
       autoload :InstallGeard, action_root.join("install_geard")
-      autoload :InstallGeardBroker, action_root.join("install_geard_broker")
       autoload :BuildGeard, action_root.join("build_geard")
       autoload :RestartGeard, action_root.join("restart_geard")
-      autoload :RestartGeardBroker, action_root.join("restart_geard_broker")
-      autoload :RestartGeardConsole, action_root.join("restart_geard_console")
       autoload :PrepareSshConfig, action_root.join("prepare_ssh_config")
       autoload :SyncLocalRepository, action_root.join("sync_local_repository")
       autoload :SyncUpstreamRepository, action_root.join("sync_upstream_repository")
@@ -301,7 +256,6 @@ module Vagrant
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
       autoload :InstallRhc, action_root.join("install_rhc")
-      autoload :SetupGeardBroker, action_root.join("setup_geard_broker")
       autoload :SetupBindHost, action_root.join("setup_bind_host")
     end
   end

data/lib/vagrant-openshift/command/checkout_repositories.rb

@@ -31,12 +31,12 @@ module Vagrant
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant checkout-repos"
             o.separator ""
-            
+
             o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
               options[:branch] = {"origin-server" => f}
             end
-                        
-           #@options[:branch][repo_name]            
+
+           #@options[:branch][repo_name]
           end
 
           # Parse the options

data/lib/vagrant-openshift/command/test.rb

@@ -43,7 +43,7 @@ module Vagrant
               options[:node] = true
             end
 
-            o.on("-t", "--cart", String, "Run cartridge tests") do |f|
+            o.on("-t", "--cart", "--cartridge", String, "Run cartridge tests") do |f|
               options[:cart] = true
             end
 

data/lib/vagrant-openshift/command/test_geard.rb

@@ -38,7 +38,7 @@ module Vagrant
               options[:all] = true
             end
 
-            o.on("-d","--artifacts", String, "Download logs and rpms") do |f|
+            o.on("-d","--artifacts", String, "Download logs") do |f|
               options[:download] = true
             end
           end

data/lib/vagrant-openshift/command/test_geard_image.rb

@@ -135,11 +135,11 @@ exit $status
             # Vagrant throws an exception if any execute invocation returns non-zero,
             # so catch it so we can return a proper output.
             rescue => e
-              @env.ui.info "Exception: #{e}"  
+              @env.ui.info "Exception: #{e}"
             end
             @env.ui.info "RC=#{rc}"
             return rc
-          end 
+          end
         end
       end
     end

data/lib/vagrant-openshift/plugin.rb

@@ -62,36 +62,11 @@ module Vagrant
         Commands::InstallGeard
       end
 
-      command "install-geard-broker" do
-        require_relative "command/install_geard_broker"
-        Commands::InstallGeardBroker
-      end
-
       command "restart-geard" do
         require_relative "command/restart_geard"
         Commands::RestartGeard
       end
 
-      command "restart-geard-broker" do
-        require_relative "command/restart_geard_broker"
-        Commands::RestartGeardBroker
-      end
-
-      command "build-geard-broker" do
-        require_relative "command/build_geard_broker"
-        Commands::BuildGeardBroker
-      end
-
-      command "restart-geard-console" do
-        require_relative "command/restart_geard_console"
-        Commands::RestartGeardConsole
-      end
-
-      command "build-geard-console" do
-        require_relative "command/build_geard_console"
-        Commands::BuildGeardConsole
-      end
-
       command "build-geard-images" do
         require_relative "command/build_geard_images"
         Commands::BuildGeardImages
@@ -152,11 +127,6 @@ module Vagrant
         Commands::InstallRhc
       end
 
-      command "setup-geard-broker" do
-        require_relative "command/setup_geard_broker"
-        Commands::SetupGeardBroker
-      end
-
       command "test-geard-image" do
         require_relative "command/test_geard_image"
         Commands::TestGeardImage

data/lib/vagrant-openshift/templates/builder/lib/test.rb

@@ -53,7 +53,7 @@ class Test
       (1..4).each do |i|
         test_queues[i-1] << build_cucumber_command("Extended Gear Group #{i}", ["@gear_extended#{i}"])
       end
-      (1..4).each do |i|
+      (1..3).each do |i|
         test_queues[i-1] << build_rake_command("OpenShift Gear Functionals Ext #{i}", "cd /data/src/github.com/openshift/openshift-test/node; rake ext_gear_func_test#{i}")
       end
     end

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.9"
+    VERSION = "1.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,8 +123,6 @@ files:
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
 - lib/vagrant-openshift/action/build_geard.rb
-- lib/vagrant-openshift/action/build_geard_broker.rb
-- lib/vagrant-openshift/action/build_geard_console.rb
 - lib/vagrant-openshift/action/build_geard_images.rb
 - lib/vagrant-openshift/action/build_sources.rb
 - lib/vagrant-openshift/action/checkout_repositories.rb
@@ -143,7 +141,6 @@ files:
 - lib/vagrant-openshift/action/install_build_dependencies.rb
 - lib/vagrant-openshift/action/install_geard.rb
 - lib/vagrant-openshift/action/install_geard_base_dependencies.rb
-- lib/vagrant-openshift/action/install_geard_broker.rb
 - lib/vagrant-openshift/action/install_geard_images.rb
 - lib/vagrant-openshift/action/install_open_shift_dependencies.rb
 - lib/vagrant-openshift/action/install_rhc.rb
@@ -154,15 +151,12 @@ files:
 - lib/vagrant-openshift/action/prepare_ssh_config.rb
 - lib/vagrant-openshift/action/preserve_mcollective_logs.rb
 - lib/vagrant-openshift/action/restart_geard.rb
-- lib/vagrant-openshift/action/restart_geard_broker.rb
-- lib/vagrant-openshift/action/restart_geard_console.rb
 - lib/vagrant-openshift/action/run_geard_tests.rb
 - lib/vagrant-openshift/action/run_tests.rb
 - lib/vagrant-openshift/action/set_host_name.rb
 - lib/vagrant-openshift/action/setup_bind_dns_key.rb
 - lib/vagrant-openshift/action/setup_bind_host.rb
 - lib/vagrant-openshift/action/setup_builder_files.rb
-- lib/vagrant-openshift/action/setup_geard_broker.rb
 - lib/vagrant-openshift/action/sync_local_repository.rb
 - lib/vagrant-openshift/action/sync_upstream_repository.rb
 - lib/vagrant-openshift/action/test_exit_code.rb
@@ -170,15 +164,12 @@ files:
 - lib/vagrant-openshift/action/yum_update.rb
 - lib/vagrant-openshift/command/build_geard.rb
 - lib/vagrant-openshift/command/build_geard_base.rb
-- lib/vagrant-openshift/command/build_geard_broker.rb
-- lib/vagrant-openshift/command/build_geard_console.rb
 - lib/vagrant-openshift/command/build_geard_images.rb
 - lib/vagrant-openshift/command/build_origin_base.rb
 - lib/vagrant-openshift/command/checkout_repositories.rb
 - lib/vagrant-openshift/command/clone_upstream_repositories.rb
 - lib/vagrant-openshift/command/create_ami.rb
 - lib/vagrant-openshift/command/install_geard.rb
-- lib/vagrant-openshift/command/install_geard_broker.rb
 - lib/vagrant-openshift/command/install_rhc.rb
 - lib/vagrant-openshift/command/local_geard_setup.rb
 - lib/vagrant-openshift/command/local_repo_setup.rb
@@ -188,9 +179,6 @@ files:
 - lib/vagrant-openshift/command/repo_sync.rb
 - lib/vagrant-openshift/command/repo_sync_geard.rb
 - lib/vagrant-openshift/command/restart_geard.rb
-- lib/vagrant-openshift/command/restart_geard_broker.rb
-- lib/vagrant-openshift/command/restart_geard_console.rb
-- lib/vagrant-openshift/command/setup_geard_broker.rb
 - lib/vagrant-openshift/command/test.rb
 - lib/vagrant-openshift/command/test_geard.rb
 - lib/vagrant-openshift/command/test_geard_image.rb

data/lib/vagrant-openshift/action/build_geard_broker.rb

@@ -1,59 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class BuildGeardBroker
-        include CommandHelper
-
-        def initialize(app, env, options = {})
-          @app = app
-          @env = env
-          @options = options
-        end
-
-        def call(env)
-          docker_file_path = "broker/docker/origin-broker-builder"
-          build_builder_cmd = %{
-echo "Performing origin-broker-builder build..."
-set -e
-pushd #{Constants.build_dir}origin-server/#{docker_file_path}
-  docker build --rm #{@options[:force] ? "--no-cache" : ""} -t origin-broker-builder .
-popd
-          }
-          build_broker_cmd = %{
-echo "Copy generated plugin configuration to broker source for use in build"
-PLUGINS_CONF="#{Vagrant::Openshift::Constants.plugins_conf_dir}"
-cp -f --parents $(find $PLUGINS_CONF \\( -name "*.conf" \\)) /data/src/github.com/openshift/origin-server
-echo "Performing broker build..."
-set -e
-gear build #{Constants.build_dir}origin-server/ origin-broker-builder origin-broker --verbose
-          }
-
-          if @options[:force]
-            sudo(env[:machine], build_builder_cmd + build_broker_cmd, {:timeout => 60*40})
-          else
-            sudo(env[:machine], sync_bash_command_on_dockerfile('origin-server', docker_file_path, build_builder_cmd), {:timeout => 60*20})
-
-            sudo(env[:machine], sync_bash_command('origin-server', build_broker_cmd), {:timeout => 60*20})
-            @app.call(env)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/build_geard_console.rb

@@ -1,55 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class BuildGeardConsole
-        include CommandHelper
-
-        def initialize(app, env, options = {})
-          @app = app
-          @env = env
-          @options = options
-        end
-
-        def call(env)
-          docker_file_path = "console/docker/origin-console-builder"
-          build_builder_cmd = %{
-echo "Performing origin-console-builder build..."
-set -e
-pushd #{Constants.build_dir}origin-server/#{docker_file_path}
-  docker build --rm #{@options[:force] ? "--no-cache" : ""} -t origin-console-builder .
-popd
-          }
-          build_console_cmd = %{
-echo "Performing console build..."
-set -e
-gear build #{Constants.build_dir}origin-server/ origin-console-builder origin-console --verbose
-          }
-          if @options[:force]
-            sudo(env[:machine], build_builder_cmd + build_console_cmd, {:timeout => 60*40})
-          else
-            sudo(env[:machine], sync_bash_command_on_dockerfile('origin-server', docker_file_path, build_builder_cmd), {:timeout => 60*20})
-
-            sudo(env[:machine], sync_bash_command('origin-server', build_console_cmd), {:timeout => 60*20})
-            @app.call(env)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/install_geard_broker.rb

@@ -1,39 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class InstallGeardBroker
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          sudo(env[:machine], %{
-set -e
-pushd /data/src/github.com/openshift/origin-server/broker/docker
-  gear deploy origin_deploy.json
-popd
-          })
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/restart_geard_broker.rb

@@ -1,43 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class RestartGeardBroker
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          #TODO the second line is a temporary hack due to the selinux policies being outdated in the repo
-          #TODO post geard fixes, remove sleep 2, and gear init from sudo below
-          sudo(env[:machine], %{
-set -e
-gear restart origin-broker-1
-sleep 2
-gear init --post "origin-broker-1" "origin-broker"
-          })
-          @app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/restart_geard_console.rb

@@ -1,43 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class RestartGeardConsole
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          #TODO the second line is a temporary hack due to the selinux policies being outdated in the repo
-          #TODO post geard fixes, remove sleep 2, and gear init from sudo below
-          sudo(env[:machine], %{
-set -e
-gear restart origin-console-1
-sleep 2
-gear init --post "origin-console-1" "origin-console"
-          })
-          @app.call(env)
-        end
-
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/action/setup_geard_broker.rb

@@ -1,71 +0,0 @@
-#--
-# Copyright 2014 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-
-module Vagrant
-  module Openshift
-    module Action
-      class SetupGeardBroker
-        include CommandHelper
-
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          sudo(env[:machine], %{
-#{bash_systemd_polling_functions}
-#
-gear list-units
-
-echo "Waiting for origin-db and origin-broker to become available..."
-
-if ! wait_for_activate origin-db; then
-  echo "WARNING: The 'origin-db' container is not ACTIVE. Trying restart..."
-  gear restart origin-db-1
-  if ! wait_for_activate origin-db; then
-    echo "ERROR: Unable to activate the origin-db container."
-    gear status origin-db-1
-    exit 1
-  fi
-fi
-
-if ! wait_for_activate origin-broker; then
-  echo "WARNING: The 'origin-broker' container is not ACTIVE. Trying restart..."
-  gear restart origin-broker-1
-  if ! wait_for_activate origin-broker; then
-    echo "ERROR: Unable to activate the origin-broker container."
-    gear status origin-broker-1
-    exit 1
-  fi
-fi
-
-echo "Install cartridges into broker"
-
-retries=1
-until [ $retries -ge 5 ]; do
-    switchns --container="origin-broker-1" -- /bin/bash --login -c '$HOME/src/docker/openshift_init'
-    [ $? == 0 ] && break
-    echo "Installing cartridges failed ($?). Retry \#$retries" && sleep 1
-    retries=$[$retries+1]
-done
-})
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/build_geard_broker.rb

@@ -1,59 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class BuildGeardBroker < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "builds and installs the broker for geard"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-          options[:local_source] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-geard-broker [vm-name]"
-            o.separator ""
-
-            o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
-              options[:branch] = {"origin-server" => f}
-            end
-
-            o.on("-f", "--force", "Force a rebuild of the broker even if there has not been a change to the source.") do |c|
-              options[:force] = true
-            end                    
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_geard_broker(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/build_geard_console.rb

@@ -1,59 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class BuildGeardConsole < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "builds and installs the console for geard"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-          options[:local_source] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-geard-console [vm-name]"
-            o.separator ""
-
-            o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
-              options[:branch] = {"origin-server" => f}
-            end
-
-            o.on("-f", "--force", "Force a rebuild of the console even if there has not been a change to the source.") do |c|
-              options[:force] = true
-            end            
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_geard_console(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/install_geard_broker.rb

@@ -1,51 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class InstallGeardBroker < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "installs geard-based broker"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-          options[:local_source] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-geard-broker [vm-name]"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_geard_broker(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/restart_geard_broker.rb

@@ -1,51 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class RestartGeardBroker < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "restarts geard-based broker"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-          options[:local_source] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant restart-geard-broker [vm-name]"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.restart_geard_broker(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/restart_geard_console.rb

@@ -1,51 +0,0 @@
-#--
-# Copyright 2013 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class RestartGeardConsole < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "restarts geard-based console"
-        end
-
-        def execute
-          options = {}
-          options[:clean] = false
-          options[:local_source] = false
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant restart-geard-console [vm-name]"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.restart_geard_console(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-openshift/command/setup_geard_broker.rb

@@ -1,49 +0,0 @@
-#--
-# Copyright 2014 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#++
-require_relative "../action"
-
-module Vagrant
-  module Openshift
-    module Commands
-      class SetupGeardBroker < Vagrant.plugin(2, :command)
-        include CommandHelper
-
-        def self.synopsis
-          "Populate running broker with required data to interact with geard"
-        end
-
-        def execute
-          options = {}
-
-          opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant setup-geard-broker"
-            o.separator ""
-          end
-
-          # Parse the options
-          argv = parse_options(opts)
-          return if !argv
-
-          with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.setup_geard_broker(options)
-            @env.action_runner.run actions, {:machine => machine}
-            0
-          end
-        end
-      end
-    end
-  end
-end