vagrant-openshift 1.0.20 → 2.0.0

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

@@ -0,0 +1,50 @@
+#--
+# Copyright 2015 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 BootstrapOpenshift < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          'Configures OpenShift with sample project "Turbo"'
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant bootstrap-openshift [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.bootstrap_openshift(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/{build_openshift3.rb → build_openshift.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift3 < Vagrant.plugin(2, :command)
+      class BuildOpenshift < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -28,12 +28,11 @@ module Vagrant
         def execute
           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.banner = "Usage: vagrant build-openshift [vm-name]"
             o.separator ""
 
             o.on("--images", "Build the images as well as core content.") do |c|
@@ -49,7 +48,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift3(options)
+            actions = Vagrant::Openshift::Action.build_openshift(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{build_openshift3_base.rb → build_openshift_base.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift3Base < Vagrant.plugin(2, :command)
+      class BuildOpenshiftBase < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -28,10 +28,9 @@ module Vagrant
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift3-base [vm-name]"
+            o.banner = "Usage: vagrant build-openshift-base [vm-name]"
             o.separator ""
           end
 
@@ -40,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift3_base(options)
+            actions = Vagrant::Openshift::Action.build_openshift_base(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

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

@@ -18,20 +18,19 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class BuildOpenshift3BaseImages < Vagrant.plugin(2, :command)
+      class BuildOpenshiftBaseImages < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "builds openshift v3 infrastructure images"
+          "builds openshift infrastructure images"
         end
 
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant build-openshift3-base-images"
+            o.banner = "Usage: vagrant build-openshift-base-images"
             o.separator ""
           end
 
@@ -40,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.build_openshift3_base_images(options)
+            actions = Vagrant::Openshift::Action.build_openshift_base_images(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

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

@@ -28,7 +28,6 @@ module Vagrant
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant build-sti [vm-name]"

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

@@ -0,0 +1,50 @@
+#--
+# 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 InstallDockerRegistry < Vagrant.plugin(2, :command)
+        include CommandHelper
+
+        def self.synopsis
+          "installs docker registry as container"
+        end
+
+        def execute
+          options = {}
+          options[:clean] = false
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant install-docker-registry [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_docker_registry(options)
+            @env.action_runner.run actions, {:machine => machine}
+            0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/command/{install_openshift3.rb → install_openshift.rb}

@@ -18,20 +18,19 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallOpenshift3 < Vagrant.plugin(2, :command)
+      class InstallOpenshift < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs openshift3"
+          "installs openshift"
         end
 
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift3 [vm-name]"
+            o.banner = "Usage: vagrant install-openshift [vm-name]"
             o.separator ""
           end
 
@@ -40,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_openshift3(options)
+            actions = Vagrant::Openshift::Action.install_openshift(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

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

@@ -18,18 +18,18 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallOpenshift3AssetsBase < Vagrant.plugin(2, :command)
+      class InstallOpenshiftAssetsBase < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs openshift3 asset dependencies"
+          "installs openshift asset dependencies"
         end
 
         def execute
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift3-assets-base [vm-name]"
+            o.banner = "Usage: vagrant install-openshift-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_openshift3_assets_base(options)
+            actions = Vagrant::Openshift::Action.install_openshift_assets_base(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{install_openshift3_router.rb → install_openshift_router.rb}

@@ -18,20 +18,19 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class InstallOpenshift3Router < Vagrant.plugin(2, :command)
+      class InstallOpenshiftRouter < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "installs openshift3 router"
+          "installs openshift router"
         end
 
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant install-openshift3-router [vm-name]"
+            o.banner = "Usage: vagrant install-openshift-router [vm-name]"
             o.separator ""
           end
 
@@ -40,7 +39,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.install_openshift3_router(options)
+            actions = Vagrant::Openshift::Action.install_openshift_router(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{local_openshift3_setup.rb → local_openshift_setup.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class LocalOpenshift3Setup < Vagrant.plugin(2, :command)
+      class LocalOpenshiftSetup < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -32,7 +32,7 @@ module Vagrant
           }
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant openshift3-local-checkout [options]"
+            o.banner = "Usage: vagrant openshift-local-checkout [options]"
             o.separator ""
 
             o.on("-b [branch-name]", "--branch [branch-name]", String, "Check out the specified branch. Default is 'master'.") do |f|
@@ -52,7 +52,7 @@ module Vagrant
           argv = parse_options(opts)
           return if !argv
 
-          actions = Vagrant::Openshift::Action.local_openshift3_checkout(options)
+          actions = Vagrant::Openshift::Action.local_openshift_checkout(options)
           @env.action_runner.run actions
           0
         end

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

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013-2015 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.
@@ -22,7 +22,7 @@ module Vagrant
         include CommandHelper
 
         def self.synopsis
-          "creates an OpenShift Vagrantfile based on the options supplied"
+          "creates an .vagrant-openshift.json config file based on the options supplied"
         end
 
         def execute
@@ -30,17 +30,18 @@ module Vagrant
             :no_base  => false,
             :os       => 'centos7',
             :stage    => 'inst',
-            :port_mappings => []
+            :port_mappings => [],
+            :no_synced_folders => false
           }
 
-          valid_stage = ['os','deps','inst']
+          valid_stage = ['os','deps','inst', 'bootstrap']
           valid_os = ['centos7','fedora','rhel7']
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant origin-init [vm or instance name]"
             o.separator ""
 
-            o.on("-s [stage]", "--stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]") do |f|
+            o.on("-s [stage]", "--stage [stage]", String, "Specify what build state to start from:\n\tos = base operating system\n\tdeps = only dependencies installed\n\tinst = dev environment [default]\n\tbootstrap = running environment") do |f|
               options[:stage] = f
             end
 
@@ -51,6 +52,10 @@ module Vagrant
             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
+
+            o.on('--no-synced-folders', 'Checkout source into image rather than mapping from host system') do |f|
+              options[:no_synced_folders] = true
+            end
           end
 
           # Parse the options

data/lib/vagrant-openshift/command/{push_openshift3_images.rb → push_openshift_images.rb}

@@ -19,11 +19,11 @@ module Vagrant
   module Openshift
     module Commands
 
-      class PushOpenshift3Images < Vagrant.plugin(2, :command)
+      class PushOpenshiftImages < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "build and push openshift v3 images"
+          "build and push openshift images"
         end
 
         def execute
@@ -31,7 +31,7 @@ module Vagrant
           options[:registry] = nil
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant push-openshift3-images --registry DOCKER_REGISTRY [vm-name]"
+            o.banner = "Usage: vagrant push-openshift-images --registry DOCKER_REGISTRY [vm-name]"
             o.on("--registry [url]", String, "Docker Registry to push images to.") do |c|
               options[:registry] = c
             end
@@ -56,7 +56,7 @@ module Vagrant
           end
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.push_openshift3_images(options)
+            actions = Vagrant::Openshift::Action.push_openshift_images(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{push_openshift3_release.rb → push_openshift_release.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class PushOpenshift3Release < Vagrant.plugin(2, :command)
+      class PushOpenshiftRelease < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -29,7 +29,7 @@ module Vagrant
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant push-openshift3-release --registry [registry_name] --include-base [vm-name]"
+            o.banner = "Usage: vagrant push-openshift-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|
@@ -46,7 +46,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.push_openshift3_release(options)
+            actions = Vagrant::Openshift::Action.push_openshift_release(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{repo_sync_openshift3.rb → repo_sync_openshift.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class RepoSyncOpenshift3 < Vagrant.plugin(2, :command)
+      class RepoSyncOpenshift < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -33,7 +33,7 @@ module Vagrant
           options[:source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant sync-openshift3 [vm-name]"
+            o.banner = "Usage: vagrant sync-openshift [vm-name]"
             o.separator ""
 
             o.on("-s", "--source", "Sync the source (not required if using synced folders)") do |f|
@@ -59,7 +59,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.repo_sync_openshift3(options)
+            actions = Vagrant::Openshift::Action.repo_sync_openshift(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end