vagrant-openshift 1.0.20 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60035a28df487a9fc63926339b7f19161411cb70
-  data.tar.gz: 4ccdb3969ae2604e6eef000a99ddd154bde499e2
+  metadata.gz: b91334619f954dd65a30a86f9d39bf0d8bef0eff
+  data.tar.gz: 4e33f84aeeb48885bfd3adf47333d14557d91c83
 SHA512:
-  metadata.gz: 73f1007e3131c3b4c32b61394282ba9cfeb704ae429ecff80f91e95dfb9f3e7d2491de49619936ffc31d9e982c5f267a9a4ef4df2e579504b5e5bd597b29c0ce
-  data.tar.gz: f1c801666864c63cee90ebbbcd2a51067f1c8ef4c57e523d47b1c2feab10f29c968b685f504d6d6d9fd80eb5be3e6a7a38dcb107a70ca08476552b3392a3c417
+  metadata.gz: 16c9b08cc1f21f9bcc4291500bc96d26b02f38aac2f8b1659a64629e18752f0219bb5a385438144b15c780a33a3198139c86e3d33aee534bd023ca6c711b13c8
+  data.tar.gz: 3449a265440af515971b5b6ca842c0df01259b6f5e075f9faeded5448a558144f0dc5afbbd1c3ff6f1f6531ac22b50822a1333b3b9df5370c1f96dd480a96bd2

data/.gitignore

@@ -20,3 +20,4 @@ test/version_tmp
 test/Vagrantfile
 tmp
 vendor
+.vagrant-openshift.json

data/README.asciidoc

@@ -55,7 +55,7 @@ $ vagrant plugin install vagrant-openshift
 
 This plugin works in concert with the
 link:https://github.com/openshift/origin/blob/master/Vagrantfile[OpenShift Origin Vagrantfile]
-to build and update OpenShift v3 development environments.
+to build and update OpenShift development environments.
 
 ==== Clone the OpenShift Origin repositories
 
@@ -77,7 +77,7 @@ Then clone the repositories into your GOPATH.
 [source, sh]
 ----
 $ cd $GOPATH
-$ vagrant openshift3-local-checkout -u <github username>
+$ vagrant openshift-local-checkout -u <github username>
 $ cd src/github.com/openshift/origin
 ----
 
@@ -113,7 +113,7 @@ NOTE: See link:#other-providers[Other Providers] below for launching VMs from ot
 
 [source, sh]
 ----
-$ vagrant sync-openshift3
+$ vagrant sync-openshift
 ----
 
 For some providers, your local repositories are automatically synchronized
@@ -128,7 +128,7 @@ rebuild only the OpenShift binary, use the `--no-images` option.
 
 [source, sh]
 ----
-$ vagrant test-openshift3 --all
+$ vagrant test-openshift --all
 ----
 
 
@@ -385,11 +385,12 @@ Ideally you would be able to use an image with the operating system,
 dependencies, and OpenShift already installed so you can just start
 hacking. But at this time that is not available for all providers.
 
-Images may be thought of as being at one of three stages:
+Images may be thought of as being at one of four stages:
 
 1. "os" - The base OS image (use a "minimal" one).
 2. "deps" - OpenShift runtime dependencies and build requirements are installed.
 3. "inst" - OpenShift code, images, and binaries are built and installed
+4. "bootstrap" - OpenShift installed and running
 
 You may want to create images that snapshot the output at each of
 these stages, as the rate of change and amount of time to create each
@@ -401,30 +402,42 @@ you will need to install the build tools and other dependencies for
 building and running OpenShift. The following vagrant commands should
 help with this:
 
+[source, sh]
 ----
-$ vagrant build-openshift3-base
-$ vagrant build-openshift3-base-images
-$ vagrant install-openshift3-assets-base
+$ vagrant build-openshift-base
+$ vagrant build-openshift-base-images
+$ vagrant install-openshift-assets-base
 ----
 
 Given this base foundation, you may want to `vagrant package` the result before proceeding to install OpenShift code.
 
+[source, sh]
 ----
-$ vagrant install-openshift3
-$ vagrant build-openshift3-base-images  # pick up updates if older "deps" base reused
-$ vagrant build-openshift3 --images
+$ vagrant install-openshift
+$ vagrant build-openshift-base-images  # pick up updates if older "deps" base reused
+$ vagrant build-openshift --images
 $ vagrant build-sti --binary-only
 ----
 
-You may again wish to package this in order to reuse.
+=== Creating a "bootstrap" Vagrant Box
 
-If your provider is not set up to automatically sync changes from a local,
-you may do the following to get the host prepared for a git-based sync
-and then use that:
+Assuming you are targeting the v0.4.4 for your vagrant box
 
+[source, sh]
 ----
-$ vagrant clone-upstream-repos  # and then to git sync and build:
-$ vagrant sync-openshift3 -s
+$ cd ~/tmp
+$ vagrant openshift-local-checkout --replace --branch v0.4.4
+$ pushd origin
+$ vagrant origin-init --stage inst --os fedora openshift-bootstrap --no-synced-folders
+$ vagrant up
+$ vagrant clone-upstream-repos --clean
+$ vagrant checkout-repos --branch v0.4.4
+$ vagrant build-openshift --images
+$ vagrant build-sti --binary-only
+$ vagrant bootstrap-openshift
+
+$ rm -f /tmp/fedora_virtualbox_bootstrap.box
+$ vagrant package --output /tmp/fedora_virtualbox_bootstrap.box
 ----
 
 == Notice of Export Control Law

data/lib/vagrant-openshift/action.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.
@@ -21,48 +21,48 @@ module Vagrant
     module Action
       include Vagrant::Action::Builtin
 
-      def self.build_openshift3_base(options)
+      def self.build_openshift_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
           b.use YumUpdate
           b.use SetHostName
-          b.use InstallOpenshift3BaseDependencies
+          b.use InstallOpenshiftBaseDependencies
         end
       end
 
-      def self.install_openshift3(options)
+      def self.install_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use YumUpdate
           b.use SetHostName
-          b.use InstallOpenshift3
-          b.use InstallOpenshift3Rhel7
-          b.use InstallOpenshift3AssetDependencies
+          b.use InstallOpenshift
+          b.use InstallOpenshiftRhel7
+          b.use InstallOpenshiftAssetDependencies
         end
       end
 
-      def self.install_openshift3_router(options)
+      def self.install_openshift_router(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use RunSystemctl, {:action => "start", :service => "openshift"}
-          b.use InstallOpenshift3Router
+          b.use InstallOpenshiftRouter
           b.use RunSystemctl, {:action => "stop", :service => "openshift"}
         end
       end
 
-      def self.install_openshift3_assets_base(options)
+      def self.install_openshift_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use InstallOpenshift3AssetDependencies
+          b.use InstallOpenshiftAssetDependencies
         end
       end
 
-      def self.build_openshift3(options)
+      def self.build_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift3, options
+          b.use BuildOpenshift, options
         end
       end
 
-      def self.push_openshift3_images(options)
+      def self.push_openshift_images(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use PushOpenshift3Images, options
+          b.use PushOpenshiftImages, options
         end
       end
 
@@ -72,19 +72,19 @@ module Vagrant
         end
       end
 
-      def self.try_restart_openshift3(options)
+      def self.try_restart_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
         end
       end
 
-      def self.build_openshift3_base_images(options)
+      def self.build_openshift_base_images(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift3BaseImages, options
+          b.use BuildOpenshiftBaseImages, options
         end
       end
 
-      def self.repo_sync_openshift3(options)
+      def self.repo_sync_openshift(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use PrepareSshConfig
           if options[:source]
@@ -94,11 +94,11 @@ module Vagrant
             end
             b.use SyncLocalRepository
             b.use CheckoutRepositories
-            b.use InstallOpenshift3AssetDependencies
+            b.use InstallOpenshiftAssetDependencies
           end
           if options[:build]
-            b.use(BuildOpenshift3BaseImages, options) if options[:images]
-            b.use(BuildOpenshift3, options)
+            b.use(BuildOpenshiftBaseImages, options) if options[:images]
+            b.use(BuildOpenshift, options)
             b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
           end
         end
@@ -121,19 +121,19 @@ module Vagrant
         end
       end
 
-      def self.local_openshift3_checkout(options)
+      def self.local_openshift_checkout(options)
         Vagrant::Action::Builder.new.tap do |b|
           if not options[:no_build]
-            b.use LocalOpenshift3Checkout, options
+            b.use LocalOpenshiftCheckout, options
           end
         end
       end
 
-      def self.run_openshift3_tests(options)
+      def self.run_openshift_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use RunOpenshift3Tests, options
+          b.use RunOpenshiftTests, options
           if options[:download]
-            b.use DownloadArtifactsOpenshift3
+            b.use DownloadArtifactsOpenshift
           end
           b.use TestExitCode
         end
@@ -180,9 +180,9 @@ module Vagrant
         end
       end
 
-      def self.push_openshift3_release(options)
+      def self.push_openshift_release(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use PushOpenshift3Release, options
+          b.use PushOpenshiftRelease, options
         end
       end
 
@@ -204,6 +204,26 @@ module Vagrant
         end
       end
 
+      def self.install_docker_registry
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use InstallDockerRegistry
+        end
+      end
+
+      def self.bootstrap_openshift(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use RunSystemctl, {:action => 'restart', :service => 'docker'}
+          b.use BootstrapOpenshift
+          b.use RunSystemctl, {:action => 'enable', :service => 'openshift'}
+          b.use RunSystemctl, {:action => 'start', :service => 'openshift', argv: '--force'}
+          b.use WaitForOpenshift
+          b.use InstallOpenshiftRouter
+          b.use InstallDockerRegistry
+          b.use SetupSamplePolicy
+          b.use CreateSampleProject
+        end
+      end
+
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :Clean, action_root.join("clean")
       autoload :CloneUpstreamRepositories, action_root.join("clone_upstream_repositories")
@@ -212,33 +232,38 @@ module Vagrant
       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 :InstallOpenshift3BaseDependencies, action_root.join("install_openshift3_base_dependencies")
-      autoload :InstallOpenshift3AssetDependencies, action_root.join("install_openshift3_asset_dependencies")
-      autoload :BuildOpenshift3BaseImages, action_root.join("build_openshift3_base_images")
-      autoload :PushOpenshift3Images, action_root.join("push_openshift3_images")
-      autoload :PushOpenshift3Release, action_root.join("push_openshift3_release")
-      autoload :InstallOpenshift3, action_root.join("install_openshift3")
-      autoload :InstallOpenshift3Rhel7, action_root.join("install_openshift3_rhel7")
-      autoload :BuildOpenshift3, action_root.join("build_openshift3")
+      autoload :InstallOpenshiftBaseDependencies, action_root.join("install_openshift_base_dependencies")
+      autoload :InstallOpenshiftAssetDependencies, action_root.join("install_openshift_asset_dependencies")
+      autoload :BuildOpenshiftBaseImages, action_root.join("build_openshift_base_images")
+      autoload :PushOpenshiftImages, action_root.join("push_openshift_images")
+      autoload :PushOpenshiftRelease, action_root.join("push_openshift_release")
+      autoload :InstallOpenshift, action_root.join("install_openshift")
+      autoload :InstallOpenshiftRhel7, action_root.join("install_openshift_rhel7")
+      autoload :BuildOpenshift, action_root.join("build_openshift")
       autoload :BuildSti, action_root.join("build_sti")
       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 :LocalOpenshift3Checkout, action_root.join("local_openshift3_checkout")
+      autoload :LocalOpenshiftCheckout, action_root.join("local_openshift_checkout")
       autoload :CreateBareRepoPlaceholders, action_root.join("create_bare_repo_placeholders")
-      autoload :RunOpenshift3Tests, action_root.join("run_openshift3_tests")
+      autoload :RunOpenshiftTests, action_root.join("run_openshift_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 :DownloadArtifactsOpenshift3, action_root.join("download_artifacts_openshift3")
+      autoload :DownloadArtifactsOpenshift, action_root.join("download_artifacts_openshift")
       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 :SetupBindHost, action_root.join("setup_bind_host")
-      autoload :InstallOpenshift3Router, action_root.join("install_openshift3_router")
+      autoload :InstallOpenshiftRouter, action_root.join("install_openshift_router")
       autoload :RunSystemctl, action_root.join("run_systemctl")
+      autoload :InstallDockerRegistry, action_root.join("install_docker_registry")
+      autoload :WaitForOpenshift, action_root.join("wait_for_openshift")
+      autoload :CreateSampleProject, action_root.join("create_sample_project")
+      autoload :SetupSamplePolicy, action_root.join("setup_sample_policy")
+      autoload :BootstrapOpenshift, action_root.join("bootstrap_openshift")
     end
   end
 end

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

@@ -0,0 +1,34 @@
+#--
+# 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.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class BootstrapOpenshift
+        include CommandHelper
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          do_execute(env[:machine], %q[echo "Bootstrap OpenShift Environment"])
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildOpenshift3
+      class BuildOpenshift
         include CommandHelper
 
         def initialize(app, env, options)

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

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildOpenshift3BaseImages
+      class BuildOpenshiftBaseImages
         include CommandHelper
 
         def initialize(app, env, options)

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

@@ -27,7 +27,9 @@ module Vagrant
         end
 
         def call(env)
-          remote_write(env[:machine], "/root/.ssh/config", "root:root", "0600") {
+          ssh_user = env[:machine].ssh_info[:username]
+
+          remote_write(env[:machine], "/#{ssh_user}/.ssh/config", "#{ssh_user}:#{ssh_user}", "0600") {
             %{Host github.com
    StrictHostKeyChecking no
    UserKnownHostsFile=/dev/null
@@ -52,7 +54,6 @@ fi
 
           git_clone_commands += "[ -n \"$PIDS\" ] && wait $PIDS\n"
 
-          ssh_user = env[:machine].ssh_info[:username]
           sudo(env[:machine], "mkdir -p #{Constants.build_dir}")
           sudo(env[:machine], "mkdir -p #{Constants.build_dir + "builder"} && chown -R #{ssh_user}:#{ssh_user} #{Constants.build_dir}")
           do_execute env[:machine], git_clone_commands

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

@@ -33,11 +33,27 @@ module Vagrant
           begin
             machine = env[:aws_compute].servers.get(env[:machine].id)
             image_req = env[:aws_compute].create_image(machine.identity, machine.tags["Name"], machine.tags["Name"], false)
-            image = env[:aws_compute].images.get(image_req.body["imageId"])
+            image = nil
+            retries = 0
+            while !image && retries < 12
+              image = env[:aws_compute].images.get(image_req.body["imageId"])
+              if image
+                break
+              else
+                retries += 1
+                sleep 5
+              end
+            end
             env[:machine].ui.info "Creating AMI #{image.id}"
-            while not image.ready?
-              sleep 10
+            retries = 0
+            while retries < 90
               image = env[:aws_compute].images.get(image_req.body["imageId"])
+              if image.ready?
+                break
+              else
+                retries += 1
+                sleep 10
+              end
             end
             env[:machine].ui.info("Done")
           rescue Excon::Errors::BadRequest => e