vagrant-openshift 1.0.12 → 1.0.13

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

@@ -0,0 +1,64 @@
+#--
+# 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 RunStiTests
+        include CommandHelper
+
+        @@SSH_TIMEOUT = 4800
+
+        def initialize(app, env, options)
+          @app = app
+          @env = env
+          @options = options.clone
+        end
+
+        def call(env)
+          @options.delete :logs
+
+          cmds = ['hack/test-go.sh']
+
+          if @options[:all]
+            cmds << 'STI_TIMEOUT="--timeout 240s" hack/test-integration.sh'
+          end
+
+          tests = ''
+          cmds.each do |cmd|
+            tests += "
+echo '***************************************************'
+echo 'Running #{cmd}...'
+time #{cmd}
+echo 'Finished #{cmd}'
+echo '***************************************************'
+"
+          end
+
+          _,_,env[:test_exit_code] = sudo(env[:machine], %{
+set -e
+pushd #{Constants.build_dir}/source-to-image >/dev/null
+export PATH=$GOPATH/bin:$PATH
+#{tests}
+popd >/dev/null
+          }, {:timeout => 60*60, :fail_on_error => false, :verbose => false})
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/action.rb

@@ -21,96 +21,76 @@ module Vagrant
     module Action
       include Vagrant::Action::Builtin
 
-      def self.build_openshift2_base(options)
+      def self.build_openshift3_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
           b.use YumUpdate
-          b.use InstallOpenshift2BuildDependencies
-          b.use SetupBuilderFiles
-          b.use Clean
-          b.use CloneUpstreamRepositories
           b.use SetHostName
-          b.use SetupBindDnsKey
-          b.use CheckoutRepositories
-          b.use InstallOpenshift2BaseDependencies
-          b.use CreateOpenshift2PuppetFile
+          b.use InstallOpenshift3BaseDependencies
         end
       end
 
-      def self.build_openshift3_base(options)
+      def self.install_openshift3(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
           b.use YumUpdate
-          b.use InstallOpenshift3BaseDependencies
-          b.use InstallOpenshift3Images
           b.use SetHostName
+          b.use InstallOpenshift3
+          b.use InstallOpenshift3AssetDependencies
         end
       end
 
-      def self.install_openshift3(options)
+      def self.install_openshift3_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use CreateYumRepositories
-          b.use YumUpdate
-          b.use SetHostName
-          b.use InstallOpenshift3
-          b.use BuildOpenshift3
+          b.use InstallOpenshift3AssetDependencies
         end
       end
 
       def self.build_openshift3(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift3
+          b.use BuildOpenshift3, options
         end
       end
 
-      def self.try_restart_openshift3(options)
+      def self.build_sti(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use TryRestartOpenshift3
+          b.use BuildSti, options
         end
       end
 
-      def self.build_openshift3_images(options)
+      def self.try_restart_openshift3(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift3Images, options
+          b.use TryRestartOpenshift3
         end
       end
 
-      def self.build_openshift3_infrastructure_images(options)
+      def self.build_openshift3_base_images(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift3InfrastructureImages, options
+          b.use BuildOpenshift3BaseImages, options
         end
       end
 
-      def self.repo_sync_openshift2(options)
+      def self.repo_sync_openshift3(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use PrepareSshConfig
-          if options[:clean]
-            b.use Clean
-            b.use SetupBuilderFiles
-            b.use CreateOpenshift2PuppetFile
-            if options[:local_source]
-              b.use CreateBareRepoPlaceholders
-            else
+          if options[:source]
+            if options[:clean]
+              b.use Clean
               b.use CloneUpstreamRepositories
             end
-          end
-
-          if options[:local_source]
             b.use SyncLocalRepository
-          else
-            b.use SyncUpstreamRepository
+            b.use CheckoutRepositories
+            b.use InstallOpenshift3AssetDependencies
           end
-          b.use CheckoutRepositories
-          b.use InstallOpenshift2BaseDependencies if options[:deps]
-          b.use UninstallOpenshift2Rpms if options[:clean]
-          b.use BuildOpenshift2 unless options[:no_build]
-          if options[:download]
-            b.use DownloadArtifactsOpenshift2
+          unless options[:no_build]
+            b.use(BuildOpenshift3BaseImages, options) if options[:images]
+            b.use(BuildOpenshift3, options)
+            b.use(TryRestartOpenshift3)
           end
         end
       end
 
-      def self.repo_sync_openshift3(options)
+      def self.repo_sync_sti(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use PrepareSshConfig
           if options[:source]
@@ -122,17 +102,7 @@ module Vagrant
             b.use CheckoutRepositories
           end
           unless options[:no_build]
-            b.use BuildOpenshift3 if options[:include].include? Vagrant::Openshift::Constants::FILTER_ORIGIN
-            b.use TryRestartOpenshift3 if options[:include].include? Vagrant::Openshift::Constants::FILTER_ORIGIN
-            b.use BuildOpenshift3Images, options if options[:include].include? Vagrant::Openshift::Constants::FILTER_IMAGES
-          end
-        end
-      end
-
-      def self.local_openshift2_checkout(options)
-        Vagrant::Action::Builder.new.tap do |b|
-          if not options[:no_build]
-            b.use LocalOpenshift2Checkout, options
+            b.use(BuildSti, options)
           end
         end
       end
@@ -145,25 +115,21 @@ module Vagrant
         end
       end
 
-      def self.run_openshift2_tests(options)
+      def self.run_openshift3_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use CreateOpenshift2TestUsers
-          b.use PreserveMcollectiveLogs
-          b.use IdleAllGearsOpenshift2
-          b.use CheckoutOpenshift2Tests
-          b.use RunOpenshift2Tests, options
+          b.use RunOpenshift3Tests, options
           if options[:download]
-            b.use DownloadArtifactsOpenshift2
+            b.use DownloadArtifactsOpenshift3
           end
           b.use TestExitCode
         end
       end
 
-      def self.run_openshift3_tests(options)
+      def self.run_sti_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use RunOpenshift3Tests, options
+          b.use RunStiTests, options
           if options[:download]
-            b.use DownloadArtifactsOpenshift3
+            b.use DownloadArtifactsSti
           end
           b.use TestExitCode
         end
@@ -200,6 +166,12 @@ module Vagrant
         end
       end
 
+      def self.push_openshift3_release(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use PushOpenshift3Release, options
+        end
+      end
+
       def self.clone_upstream_repositories(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CloneUpstreamRepositories, options
@@ -220,46 +192,35 @@ module Vagrant
 
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :Clean, action_root.join("clean")
-      autoload :UninstallOpenshift2Rpms, action_root.join("uninstall_openshift2_rpms")
       autoload :CloneUpstreamRepositories, action_root.join("clone_upstream_repositories")
       autoload :CreateYumRepositories, action_root.join("create_yum_repositories")
-      autoload :CreateOpenshift2PuppetFile, action_root.join("create_openshift2_puppet_file")
-      autoload :InstallOpenshift2BaseDependencies, action_root.join("install_openshift2_base_dependencies")
       autoload :CheckoutRepositories, action_root.join("checkout_repositories")
       autoload :SetupBindDnsKey, action_root.join("setup_bind_dns_key")
       autoload :SetHostName, action_root.join("set_host_name")
       autoload :YumUpdate, action_root.join("yum_update")
-      autoload :SetupBuilderFiles, action_root.join("setup_builder_files")
-      autoload :InstallOpenshift2BuildDependencies, action_root.join("install_openshift2_build_dependencies")
-      autoload :BuildOpenshift3Images, action_root.join("build_openshift3_images")
-      autoload :BuildOpenshift3InfrastructureImages, action_root.join("build_openshift3_infrastructure_images")
       autoload :InstallOpenshift3BaseDependencies, action_root.join("install_openshift3_base_dependencies")
-      autoload :InstallOpenshift3Images, action_root.join("install_openshift3_images")
+      autoload :InstallOpenshift3AssetDependencies, action_root.join("install_openshift3_asset_dependencies")
+      autoload :BuildOpenshift3BaseImages, action_root.join("build_openshift3_base_images")
+      autoload :PushOpenshift3Release, action_root.join("push_openshift3_release")
       autoload :InstallOpenshift3, action_root.join("install_openshift3")
       autoload :BuildOpenshift3, action_root.join("build_openshift3")
+      autoload :BuildSti, action_root.join("build_sti")
       autoload :TryRestartOpenshift3, action_root.join("try_restart_openshift3")
       autoload :PrepareSshConfig, action_root.join("prepare_ssh_config")
       autoload :SyncLocalRepository, action_root.join("sync_local_repository")
       autoload :SyncUpstreamRepository, action_root.join("sync_upstream_repository")
-      autoload :BuildOpenshift2, action_root.join("build_openshift2")
-      autoload :LocalOpenshift2Checkout, action_root.join("local_openshift2_checkout")
       autoload :LocalOpenshift3Checkout, action_root.join("local_openshift3_checkout")
       autoload :CreateBareRepoPlaceholders, action_root.join("create_bare_repo_placeholders")
-      autoload :CreateOpenshift2TestUsers, action_root.join("create_openshift2_test_users")
-      autoload :IdleAllGearsOpenshift2, action_root.join("idle_all_gears_openshift2")
-      autoload :PreserveMcollectiveLogs, action_root.join("preserve_mcollective_logs")
-      autoload :RunOpenshift2Tests, action_root.join("run_openshift2_tests")
       autoload :RunOpenshift3Tests, action_root.join("run_openshift3_tests")
-      autoload :CheckoutOpenshift2Tests, action_root.join("checkout_openshift2_tests")
+      autoload :RunStiTests, action_root.join("run_sti_tests")
       autoload :GenerateTemplate, action_root.join("generate_template")
       autoload :CreateAMI, action_root.join("create_ami")
       autoload :ModifyInstance, action_root.join("modify_instance")
       autoload :ModifyAMI, action_root.join("modify_ami")
-      autoload :DownloadArtifactsOpenshift2, action_root.join("download_artifacts_openshift2")
       autoload :DownloadArtifactsOpenshift3, action_root.join("download_artifacts_openshift3")
+      autoload :DownloadArtifactsSti, action_root.join("download_artifacts_sti")
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")
-      autoload :InstallRhc, action_root.join("install_rhc")
       autoload :SetupBindHost, action_root.join("setup_bind_host")
     end
   end

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

@@ -29,10 +29,19 @@ module Vagrant
           options = {}
           options[:clean] = false
           options[:local_source] = false
+          options[:images] = false
+          options[:force] = false
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant build-openshift3 [vm-name]"
             o.separator ""
+
+            o.on("--images", "Build the images as well as core content.") do |c|
+              options[:images] = true
+            end
+            o.on("--force", "Build regardless of whether there have been changes.") do |c|
+              options[:force] = true
+            end
           end
 
           # Parse the options

data/lib/vagrant-openshift/command/{build_openshift2_base.rb → build_openshift3_base_images.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013 Red Hat, Inc.
+# 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.
@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift2Base < Vagrant.plugin(2, :command)
+      class BuildOpenshift3BaseImages < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs the prereqs for origin"
+          "builds openshift v3 infrastructure images"
         end
 
         def execute
@@ -31,7 +31,7 @@ module Vagrant
           options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift2-base [vm-name]"
+            o.banner = "Usage: vagrant build-openshift3-base-images"
             o.separator ""
           end
 
@@ -40,7 +40,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift2_base(options)
+            actions = Vagrant::Openshift::Action.build_openshift3_base_images(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{build_openshift3_infrastructure_images.rb → build_sti.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2014 Red Hat, Inc.
+# 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.
@@ -18,11 +18,11 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift3InfrastructureImages < Vagrant.plugin(2, :command)
+      class BuildSti < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "builds openshift v3 infrastructure images"
+          "builds source-to-image"
         end
 
         def execute
@@ -31,25 +31,23 @@ module Vagrant
           options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift3-infrastructure-images --images image_name [vm-name]"
+            o.banner = "Usage: vagrant build-sti [vm-name]"
             o.separator ""
 
-            o.on("--images #{Vagrant::Openshift::Constants.openshift3_infrastructure_images.keys.join(' ')} | all", "Specify which images should be built. Default: []") do |f|
-              if f.split(" ").include?("all")
-                options[:openshift3_infrastructure_images] = Vagrant::Openshift::Constants.openshift3_infrastructure_images.keys
-              else
-                options[:openshift3_infrastructure_images] = f.split(" ")
-              end
+            o.on("--force", "Build regardless of whether there have been changes.") do |c|
+              options[:force] = true
+            end
+            o.on("--binary-only", "Only build the sti binary, no test images") do |c|
+              options[:binary_only] = true
             end
           end
 
           # Parse the options
           argv = parse_options(opts)
           return if !argv
-          raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp unless options[:openshift3_infrastructure_images]
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift3_infrastructure_images(options)
+            actions = Vagrant::Openshift::Action.build_sti(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

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

@@ -32,7 +32,7 @@ module Vagrant
             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|
+            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
 

data/lib/vagrant-openshift/command/{install_rhc.rb → install_openshift3_assets_base.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2014 Red Hat, Inc.
+# 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.
@@ -18,18 +18,18 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallRhc < Vagrant.plugin(2, :command)
+      class InstallOpenshift3AssetsBase < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "build and install rhc client tools from source"
+          "installs openshift3 asset dependencies"
         end
 
         def execute
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-rhc"
+            o.banner = "Usage: vagrant install-openshift3-assets-base [vm-name]"
             o.separator ""
           end
 
@@ -38,7 +38,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_rhc(options)
+            actions = Vagrant::Openshift::Action.install_openshift3_assets_base(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

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

@@ -35,7 +35,7 @@ module Vagrant
             o.banner = "Usage: vagrant openshift3-local-checkout [options]"
             o.separator ""
 
-            o.on("-b [branch_name]", "--branch [branch_name]", String, "Check out the specified branch. Default is 'master'.") do |f|
+            o.on("-b [branch-name]", "--branch [branch-name]", String, "Check out the specified branch. Default is 'master'.") do |f|
               options[:branch] = f
             end
 

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

@@ -28,13 +28,13 @@ module Vagrant
         def execute
           options = {
             :no_base  => false,
-            :os       => 'centos6',
+            :os       => 'centos7',
             :stage    => 'inst',
             :port_mappings => []
           }
 
           valid_stage = ['os','deps','inst']
-          valid_os = ['centos6','fedora','rhel6']
+          valid_os = ['centos7','fedora','rhel7']
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant origin-init [vm or instance name]"
@@ -44,11 +44,11 @@ module Vagrant
               options[:stage] = f
             end
 
-            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos6 [default]\n\tfedora\n\trhel6") do |f|
+            o.on("-o [name]", "--os [name]", String, "Operating system:\n\tcentos7 [default]\n\tfedora\n\trhel7") do |f|
               options[:os] = f
             end
 
-            o.on("-p [guest_port:host_port]", "--map-port [guest_port:host_port]", String, "When running on Virtualbox, map port from guest docker vm to host machine") do |f|
+            o.on("-p [guest_port:host_port]", "--map-port [guest_port:host_port]", String, "When running on VirtualBox, map port from guest docker vm to host machine") do |f|
               options[:port_mappings].push(f.split(":"))
             end
           end

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

@@ -0,0 +1,57 @@
+#--
+# 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 PushOpenshift3Release < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "pushes openshift docker images to a registry"
+        end
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant push-openshift3-release --registry [registry_name] --include-base [vm-name]"
+            o.separator ""
+
+            o.on("--registry [registry_name]", String, "A Docker registry to push images to (include a trailing slash)") do |f|
+              options[:registry_name] = f
+            end
+
+            o.on("--include-base", "Include the base infrastructure images in the push.") do |c|
+              options[:push_base_images] = 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.push_openshift3_release(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,11 +27,10 @@ module Vagrant
 
         def execute
           options = {}
-          options[:openshift3_images] = []
+          options[:images] = true
           options[:no_build] = false
           options[:clean] = false
           options[:source] = false
-          options[:include] = [ Vagrant::Openshift::Constants::FILTER_BROKER , Vagrant::Openshift::Constants::FILTER_CONSOLE ,Vagrant::Openshift::Constants::FILTER_ORIGIN, Vagrant::Openshift::Constants::FILTER_IMAGES, Vagrant::Openshift::Constants::FILTER_RHC]
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant sync-openshift3 [vm-name]"
@@ -49,17 +48,6 @@ module Vagrant
               options[:no_build] = true
             end
 
-            o.on("-i [comp comp]", "--include", String, "Sync specified components.  Default: #{options[:include].join " "}") do |f|
-              options[:include] = f.split " "
-            end
-
-            o.on("--openshift3-images [ #{Vagrant::Openshift::Constants.openshift3_images.keys.join(' ')} | all ]", "Specify which images should be synced.   Default: []") do |f|
-              if f.split(" ").include?("all")
-                options[:openshift3_images] = Vagrant::Openshift::Constants.openshift3_images.keys
-              else
-                options[:openshift3_images] = f.split(" ")
-              end
-            end
           end
 
           # Parse the options

data/lib/vagrant-openshift/command/{repo_sync_openshift2.rb → repo_sync_sti.rb}

@@ -18,43 +18,35 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class RepoSyncOpenshift2 < Vagrant.plugin(2, :command)
+      class RepoSyncSti < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "syncs and installs(by default) your local repos to the current instance"
+          "syncs your local repos to the current instance"
         end
 
         def execute
           options = {}
-          options[:clean] = false
-          options[:local_source] = true
           options[:no_build] = false
-          options[:deps] = false
+          options[:clean] = false
+          options[:source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant sync-openshift2 [vm-name]"
+            o.banner = "Usage: vagrant sync-sti [vm-name]"
             o.separator ""
 
-            o.on("-c", "--clean", "Delete existing repo and uninstall all OpenShift RPMs before syncing") do |f|
+            o.on("-c", "--clean", "Delete existing repo before syncing") do |f|
               options[:clean] = f
             end
 
-            o.on("-u", "--upstream", "Build base VM based on local source") do |f|
-              options[:local_source] = false
+            o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
+              options[:source] = f
             end
 
-            o.on("--install-deps", "Install any missing dependencies") do |f|
-              options[:deps] = f
+            o.on("--dont-install", "Don't build and install updated source") do |f|
+              options[:no_build] = true
             end
 
-            o.on("--dont-install", "Don't build and install RPMs") do |f|
-              options[:no_build] = f
-            end
-
-            o.on("-d","--artifacts", String, "Download logs and rpms") do |f|
-              options[:download] = true
-            end
           end
 
           # Parse the options
@@ -62,7 +54,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.repo_sync_openshift2(options)
+            actions = Vagrant::Openshift::Action.repo_sync_sti(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end