vagrant-openshift 1.0.20 → 2.0.0

data/lib/vagrant-openshift/command/{test_openshift3.rb → test_openshift.rb}

@@ -18,7 +18,7 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class TestOpenshift3 < Vagrant.plugin(2, :command)
+      class TestOpenshift < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -31,7 +31,7 @@ module Vagrant
           options[:all] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant test-openshift3 [machine-name]"
+            o.banner = "Usage: vagrant test-openshift [machine-name]"
             o.separator ""
 
             o.on("-a", "--all", String, "Run all tests") do |f|
@@ -56,7 +56,7 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv, :reverse => true) do |machine|
-            actions = Vagrant::Openshift::Action.run_openshift3_tests(options)
+            actions = Vagrant::Openshift::Action.run_openshift_tests(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/command/{test_openshift3_image.rb → test_openshift_image.rb}

@@ -19,7 +19,7 @@ module Vagrant
   module Openshift
     module Commands
 
-      class TestOpenshift3Image < Vagrant.plugin(2, :command)
+      class TestOpenshiftImage < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
@@ -36,7 +36,7 @@ module Vagrant
           options[:registry] = ""
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant test-openshift3-image --image IMAGE [vm-name]"
+            o.banner = "Usage: vagrant test-openshift-image --image IMAGE [vm-name]"
             o.separator ""
 
             o.on("-i", "--image IMAGE", String, "image to test") do |o|

data/lib/vagrant-openshift/command/{try_restart_openshift3.rb → try_restart_openshift.rb}

@@ -18,20 +18,19 @@ require_relative "../action"
 module Vagrant
   module Openshift
     module Commands
-      class TryRestartOpenshift3 < Vagrant.plugin(2, :command)
+      class TryRestartOpenshift < Vagrant.plugin(2, :command)
         include CommandHelper
 
         def self.synopsis
-          "restarts openshift"
+          "restarts openshift if it's already running"
         end
 
         def execute
           options = {}
           options[:clean] = false
-          options[:local_source] = false
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant try-restart-openshift3 [vm-name]"
+            o.banner = "Usage: vagrant try-restart-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.try_restart_openshift3(options)
+            actions = Vagrant::Openshift::Action.try_restart_openshift(options)
             @env.action_runner.run actions, {:machine => machine}
             0
           end

data/lib/vagrant-openshift/constants.rb

@@ -20,23 +20,24 @@ module Vagrant
     class Constants
 
       def self.repos(env)
-        openshift3_repos
+        openshift_repos
       end
 
-      def self.openshift3_repos
+      def self.openshift_repos
         {
           'origin' => 'https://github.com/openshift/origin.git',
           'source-to-image' => 'https://github.com/openshift/source-to-image.git'
         }
       end
 
-      def self.openshift3_images
+      def self.openshift_images
         {
           'openshift/base'          => 'https://github.com/openshift/sti-base.git',
-          'openshift/ruby-20'       => 'https://github.com/openshift/sti-ruby.git',
           'openshift/nodejs-010'    => 'https://github.com/openshift/sti-nodejs.git',
-          'openshift/python-33'     => 'https://github.com/openshift/sti-python.git',
           'openshift/perl-516'      => 'https://github.com/openshift/sti-perl.git',
+          'openshift/php-55'        => 'https://github.com/openshift/sti-php.git',
+          'openshift/python-33'     => 'https://github.com/openshift/sti-python.git',
+          'openshift/ruby-20'       => 'https://github.com/openshift/sti-ruby.git',
           'openshift/mysql-55'      => 'https://github.com/openshift/mysql.git',
           'openshift/mongodb-24'    => 'https://github.com/openshift/mongodb.git',
           'openshift/postgresql-92' => 'https://github.com/openshift/postgresql.git'

data/lib/vagrant-openshift/helper/command_helper.rb

@@ -124,6 +124,9 @@ pushd /data/src/github.com/openshift/#{repo_name}
   then
     #{build_cmd}
   else
+    echo "Commit ID: $commit_id"
+    echo "Previous Commit ID: $previous_commit_id"
+    echo "Git Status: $git_status"
     echo "No update for #{repo_name}, #{refname}"
   fi
   mkdir -p #{sync_path}

data/lib/vagrant-openshift/plugin.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.
@@ -32,9 +32,9 @@ module Vagrant
         Config
       end
 
-      command "sync-openshift3" do
-        require_relative "command/repo_sync_openshift3"
-        Commands::RepoSyncOpenshift3
+      command "sync-openshift" do
+        require_relative "command/repo_sync_openshift"
+        Commands::RepoSyncopenshift
       end
 
       command "sync-sti" do
@@ -42,14 +42,14 @@ module Vagrant
         Commands::RepoSyncSti
       end
 
-      command "build-openshift3-base" do
-        require_relative "command/build_openshift3_base"
-        Commands::BuildOpenshift3Base
+      command "build-openshift-base" do
+        require_relative "command/build_openshift_base"
+        Commands::BuildopenshiftBase
       end
 
-      command "build-openshift3" do
-        require_relative "command/build_openshift3"
-        Commands::BuildOpenshift3
+      command "build-openshift" do
+        require_relative "command/build_openshift"
+        Commands::Buildopenshift
       end
 
       command "build-sti" do
@@ -57,29 +57,29 @@ module Vagrant
         Commands::BuildSti
       end
 
-      command "install-openshift3" do
-        require_relative "command/install_openshift3"
-        Commands::InstallOpenshift3
+      command "install-openshift" do
+        require_relative "command/install_openshift"
+        Commands::Installopenshift
       end
 
-      command "install-openshift3-assets-base" do
-        require_relative "command/install_openshift3_assets_base"
-        Commands::InstallOpenshift3AssetsBase
+      command "install-openshift-assets-base" do
+        require_relative "command/install_openshift_assets_base"
+        Commands::InstallopenshiftAssetsBase
       end
 
-      command "try-restart-openshift3" do
-        require_relative "command/try_restart_openshift3"
-        Commands::TryRestartOpenshift3
+      command "try-restart-openshift" do
+        require_relative "command/try_restart_openshift"
+        Commands::TryRestartopenshift
       end
 
-      command "build-openshift3-base-images" do
-        require_relative "command/build_openshift3_base_images"
-        Commands::BuildOpenshift3BaseImages
+      command "build-openshift-base-images" do
+        require_relative "command/build_openshift_base_images"
+        Commands::BuildopenshiftBaseImages
       end
 
-      command "push-openshift3-images" do
-        require_relative "command/push_openshift3_images"
-        Commands::PushOpenshift3Images
+      command "push-openshift-images" do
+        require_relative "command/push_openshift_images"
+        Commands::PushopenshiftImages
       end
 
       command "origin-init" do
@@ -87,19 +87,19 @@ module Vagrant
         Commands::OpenshiftInit
       end
 
-      command "openshift3-local-checkout" do
-        require_relative "command/local_openshift3_setup"
-        Commands::LocalOpenshift3Setup
+      command "openshift-local-checkout" do
+        require_relative "command/local_openshift_setup"
+        Commands::LocalopenshiftSetup
       end
 
-      command "push-openshift3-release" do
-        require_relative "command/push_openshift3_release"
-        Commands::PushOpenshift3Release
+      command "push-openshift-release" do
+        require_relative "command/push_openshift_release"
+        Commands::PushopenshiftRelease
       end
 
-      command "test-openshift3" do
-        require_relative "command/test_openshift3"
-        Commands::TestOpenshift3
+      command "test-openshift" do
+        require_relative "command/test_openshift"
+        Commands::Testopenshift
       end
 
       command "test-sti" do
@@ -132,14 +132,24 @@ module Vagrant
         Commands::CheckoutRepositories
       end
 
-      command "test-openshift3-image" do
-        require_relative "command/test_openshift3_image"
-        Commands::TestOpenshift3Image
+      command "test-openshift-image" do
+        require_relative "command/test_openshift_image"
+        Commands::TestopenshiftImage
       end
 
-      command "install-openshift3-router" do
-        require_relative "command/install_openshift3_router"
-        Commands::InstallOpenshift3Router
+      command "install-openshift-router" do
+        require_relative "command/install_openshift_router"
+        Commands::InstallopenshiftRouter
+      end
+
+      command "install-docker-registry" do
+        require_relative 'command/install_docker_registry'
+        Commands::InstallDockerRegistry
+      end
+
+      command "bootstrap-openshift" do
+        require_relative 'command/bootstrap_openshift'
+        Commands::BootstrapOpenshift
       end
 
       provisioner(:openshift) do

data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml

@@ -23,7 +23,7 @@
       :box_name: centos7_deps
       :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_virtualbox_deps.box
     :libvirt:
-      :box_name: centos7_base
+      :box_name: centos7_deps
       :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_libvirt_deps.box
     :aws:
       :ami: <AMI_ID>
@@ -41,7 +41,7 @@
       :box_name: centos7_inst
       :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_virtualbox_inst.box
     :libvirt:
-      :box_name: centos7_base
+      :box_name: centos7_inst
       :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_libvirt_inst.box
     :aws:
       :ami: <AMI_ID>
@@ -54,6 +54,20 @@
       :image: <CentOS 7>
       :flavor: m1.small
       :ssh_user: centos
+  :bootstrap:
+    :virtualbox:
+      :box_name: centos7_bootstrap
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_virtualbox_bootstrap.box
+    :libvirt:
+      :box_name: centos7_bootstrap
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/centos7_libvirt_bootstrap.box
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: centos
+      :machine_name: <AMI_NAME>
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-centos7-bootstrap_
 :fedora:
   :os:
     :virtualbox:
@@ -109,6 +123,20 @@
     :libvirt:
       :box_name: fedora_inst
       :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_libvirt_inst.box
+  :bootstrap:
+    :virtualbox:
+      :box_name: fedora_bootstrap
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_virtualbox_bootstrap.box
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: fedora
+      :machine_name: <AMI_NAME>
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-fedora-bootstrap_
+    :libvirt:
+      :box_name: fedora_bootstrap
+      :box_url: http://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_libvirt_bootstrap.box
 :rhel7:
   :os:
     :aws:
@@ -146,3 +174,15 @@
       :image: <RHEL 7>
       :flavor: m1.small
       :ssh_user: root
+  :bootstrap:
+    :aws:
+      :ami: <AMI_ID>
+      :ami_region: us-east-1
+      :ssh_user: root
+      :machine_name: <AMI_NAME>
+      :ebs_volume_size: 25
+      :ami_tag_prefix: devenv-rhel7-bootstrap_
+    :openstack:
+      :image: <RHEL 7>
+      :flavor: m1.small
+      :ssh_user: root

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.20"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 2.0.0
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,8 +122,9 @@ files:
 - Rakefile
 - lib/vagrant-openshift.rb
 - lib/vagrant-openshift/action.rb
-- lib/vagrant-openshift/action/build_openshift3.rb
-- lib/vagrant-openshift/action/build_openshift3_base_images.rb
+- lib/vagrant-openshift/action/bootstrap_openshift.rb
+- lib/vagrant-openshift/action/build_openshift.rb
+- lib/vagrant-openshift/action/build_openshift_base_images.rb
 - lib/vagrant-openshift/action/build_sti.rb
 - lib/vagrant-openshift/action/checkout_repositories.rb
 - lib/vagrant-openshift/action/clean.rb
@@ -131,54 +132,60 @@ files:
 - lib/vagrant-openshift/action/clone_upstream_repositories.rb
 - lib/vagrant-openshift/action/create_ami.rb
 - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
+- lib/vagrant-openshift/action/create_sample_project.rb
 - lib/vagrant-openshift/action/create_yum_repositories.rb
-- lib/vagrant-openshift/action/download_artifacts_openshift3.rb
+- lib/vagrant-openshift/action/download_artifacts_openshift.rb
 - lib/vagrant-openshift/action/download_artifacts_sti.rb
 - lib/vagrant-openshift/action/generate_template.rb
-- lib/vagrant-openshift/action/install_openshift3.rb
-- lib/vagrant-openshift/action/install_openshift3_asset_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb
-- lib/vagrant-openshift/action/install_openshift3_images.rb
-- lib/vagrant-openshift/action/install_openshift3_rhel7.rb
-- lib/vagrant-openshift/action/install_openshift3_router.rb
-- lib/vagrant-openshift/action/local_openshift3_checkout.rb
+- lib/vagrant-openshift/action/install_docker_registry.rb
+- lib/vagrant-openshift/action/install_openshift.rb
+- lib/vagrant-openshift/action/install_openshift_asset_dependencies.rb
+- lib/vagrant-openshift/action/install_openshift_base_dependencies.rb
+- lib/vagrant-openshift/action/install_openshift_images.rb
+- lib/vagrant-openshift/action/install_openshift_rhel7.rb
+- lib/vagrant-openshift/action/install_openshift_router.rb
+- lib/vagrant-openshift/action/local_openshift_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
 - lib/vagrant-openshift/action/modify_instance.rb
 - lib/vagrant-openshift/action/prepare_ssh_config.rb
-- lib/vagrant-openshift/action/push_openshift3_images.rb
-- lib/vagrant-openshift/action/push_openshift3_release.rb
-- lib/vagrant-openshift/action/run_openshift3_tests.rb
+- lib/vagrant-openshift/action/push_openshift_images.rb
+- lib/vagrant-openshift/action/push_openshift_release.rb
+- lib/vagrant-openshift/action/run_openshift_tests.rb
 - lib/vagrant-openshift/action/run_sti_tests.rb
 - lib/vagrant-openshift/action/run_systemctl.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_sample_policy.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
+- lib/vagrant-openshift/action/wait_for_openshift.rb
 - lib/vagrant-openshift/action/yum_update.rb
-- lib/vagrant-openshift/command/build_openshift3.rb
-- lib/vagrant-openshift/command/build_openshift3_base.rb
-- lib/vagrant-openshift/command/build_openshift3_base_images.rb
+- lib/vagrant-openshift/command/bootstrap_openshift.rb
+- lib/vagrant-openshift/command/build_openshift.rb
+- lib/vagrant-openshift/command/build_openshift_base.rb
+- lib/vagrant-openshift/command/build_openshift_base_images.rb
 - lib/vagrant-openshift/command/build_sti.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_openshift3.rb
-- lib/vagrant-openshift/command/install_openshift3_assets_base.rb
-- lib/vagrant-openshift/command/install_openshift3_router.rb
-- lib/vagrant-openshift/command/local_openshift3_setup.rb
+- lib/vagrant-openshift/command/install_docker_registry.rb
+- lib/vagrant-openshift/command/install_openshift.rb
+- lib/vagrant-openshift/command/install_openshift_assets_base.rb
+- lib/vagrant-openshift/command/install_openshift_router.rb
+- lib/vagrant-openshift/command/local_openshift_setup.rb
 - lib/vagrant-openshift/command/modify_ami.rb
 - lib/vagrant-openshift/command/modify_instance.rb
 - lib/vagrant-openshift/command/openshift_init.rb
-- lib/vagrant-openshift/command/push_openshift3_images.rb
-- lib/vagrant-openshift/command/push_openshift3_release.rb
-- lib/vagrant-openshift/command/repo_sync_openshift3.rb
+- lib/vagrant-openshift/command/push_openshift_images.rb
+- lib/vagrant-openshift/command/push_openshift_release.rb
+- lib/vagrant-openshift/command/repo_sync_openshift.rb
 - lib/vagrant-openshift/command/repo_sync_sti.rb
-- lib/vagrant-openshift/command/test_openshift3.rb
-- lib/vagrant-openshift/command/test_openshift3_image.rb
+- lib/vagrant-openshift/command/test_openshift.rb
+- lib/vagrant-openshift/command/test_openshift_image.rb
 - lib/vagrant-openshift/command/test_sti.rb
-- lib/vagrant-openshift/command/try_restart_openshift3.rb
+- lib/vagrant-openshift/command/try_restart_openshift.rb
 - lib/vagrant-openshift/config.rb
 - lib/vagrant-openshift/constants.rb
 - lib/vagrant-openshift/helper/command_helper.rb