vagrant-openshift 2.0.10 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6afb23aff38bb9c5e56876934f390f424b6120
-  data.tar.gz: 9d63ba4a151d314534c8a4eb9025fba51be2e281
+  metadata.gz: 7160eb541de9e048c441e7db339f549436354ae3
+  data.tar.gz: bef0f3dbed4812c82833bdafdd6977347b388a03
 SHA512:
-  metadata.gz: be084f3f1c4dd7a4fb8af5419212e997efd55def06b483ba00fa8195d6ccf97fa392b82c9acd7a95869f2e9d8987b9232373f9b50a8858ab54465ed28b660472
-  data.tar.gz: 24752536ba60a84328c38554ff1c87d60d5f7eb100e8b2fcea4662f66db66f3a58b8ae34d4d6ad61e5d2b04d6e445c3d062dbbd6526328b2f4a1f5db4bcd06e5
+  metadata.gz: 8bb8f17e5aa85c520fa182855de18d98e2e375443e2856e8f650f23157e6ce155e5450845b101980b2b88f61ce03a9838e871b5e9106189074b25b68b8521853
+  data.tar.gz: 1b213155c7db4fd465b392b8daddcfd52f6efb43b23f3c8bd6a87528ee4069265eea30b122fa2a4165edc04639ebfba3706dfadbff3168d73dbf09ef13d7e91f

data/README.asciidoc

@@ -77,7 +77,7 @@ Then clone the repositories into your GOPATH.
 [source, sh]
 ----
 $ cd $GOPATH
-$ vagrant openshift-local-checkout -u <github username>
+$ vagrant origin-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-openshift
+$ vagrant sync-origin
 ----
 
 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-openshift --all
+$ vagrant test-origin --all
 ----
 
 
@@ -393,7 +393,6 @@ 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
@@ -407,18 +406,18 @@ help with this:
 
 [source, sh]
 ----
-$ vagrant build-openshift-base
-$ vagrant build-openshift-base-images
-$ vagrant install-openshift-assets-base
+$ vagrant build-origin-base
+$ vagrant build-origin-base-images
+$ vagrant install-origin-assets-base
 ----
 
 Given this base foundation, you may want to `vagrant package` the result before proceeding to install OpenShift code.
 
 [source, sh]
 ----
-$ vagrant install-openshift
-$ vagrant build-openshift-base-images  # pick up updates if older "deps" base reused
-$ vagrant build-openshift --images
+$ vagrant install-origin
+$ vagrant build-origin-base-images  # pick up updates if older "deps" base reused
+$ vagrant build-origin --images
 $ vagrant build-sti --binary-only
 ----
 

data/lib/vagrant-openshift/action.rb

@@ -27,34 +27,34 @@ module Vagrant
         end
       end
 
-      def self.build_openshift_base(options)
+      def self.build_origin_base(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use CreateYumRepositories
           b.use YumUpdate
           b.use SetHostName
-          b.use InstallOpenshiftBaseDependencies
+          b.use InstallOriginBaseDependencies
         end
       end
 
-      def self.install_openshift(options)
+      def self.install_origin(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use YumUpdate
           b.use SetHostName
-          b.use InstallOpenshift
-          b.use InstallOpenshiftRhel7
-          b.use InstallOpenshiftAssetDependencies, :restore_assets => true
+          b.use InstallOrigin
+          b.use InstallOriginRhel7
+          b.use InstallOriginAssetDependencies, :restore_assets => true
         end
       end
 
-      def self.install_openshift_assets_base(options)
+      def self.install_origin_assets_base(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use InstallOpenshiftAssetDependencies, :backup_assets => true
+          b.use InstallOriginAssetDependencies, :backup_assets => true
         end
       end
 
-      def self.build_openshift(options)
+      def self.build_origin(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshift, options
+          b.use BuildOrigin, options
         end
       end
 
@@ -70,19 +70,19 @@ module Vagrant
         end
       end
 
-      def self.try_restart_openshift(options)
+      def self.try_restart_origin(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
         end
       end
 
-      def self.build_openshift_base_images(options)
+      def self.build_origin_base_images(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use BuildOpenshiftBaseImages, options
+          b.use BuildOriginBaseImages, options
         end
       end
 
-      def self.repo_sync_openshift(options)
+      def self.repo_sync_origin(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use PrepareSshConfig
           if options[:source]
@@ -92,11 +92,11 @@ module Vagrant
             end
             b.use SyncLocalRepository
             b.use CheckoutRepositories
-            b.use InstallOpenshiftAssetDependencies, :restore_assets => true
+            b.use InstallOriginAssetDependencies, :restore_assets => true
           end
           if options[:build]
-            b.use(BuildOpenshiftBaseImages, options) if options[:images]
-            b.use(BuildOpenshift, options)
+            b.use(BuildOriginBaseImages, options) if options[:images]
+            b.use(BuildOrigin, options)
             b.use RunSystemctl, {:action => "try-restart", :service => "openshift"}
           end
         end
@@ -119,19 +119,19 @@ module Vagrant
         end
       end
 
-      def self.local_openshift_checkout(options)
+      def self.local_origin_checkout(options)
         Vagrant::Action::Builder.new.tap do |b|
           if not options[:no_build]
-            b.use LocalOpenshiftCheckout, options
+            b.use LocalOriginCheckout, options
           end
         end
       end
 
-      def self.run_openshift_tests(options)
+      def self.run_origin_tests(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use RunOpenshiftTests, options
+          b.use RunOriginTests, options
           if options[:download]
-            b.use DownloadArtifactsOpenshift
+            b.use DownloadArtifactsOrigin
           end
           b.use TestExitCode
         end
@@ -147,6 +147,18 @@ module Vagrant
         end
       end
 
+      def self.download_origin_artifacts(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use DownloadArtifactsOrigin
+        end
+      end
+
+      def self.download_sti_artifacts(options)
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use DownloadArtifactsSti
+        end
+      end
+
       def self.gen_template(options)
         Vagrant::Action::Builder.new.tap do |b|
           b.use GenerateTemplate, options
@@ -209,27 +221,27 @@ module Vagrant
       autoload :CheckoutRepositories, action_root.join("checkout_repositories")
       autoload :SetHostName, action_root.join("set_host_name")
       autoload :YumUpdate, action_root.join("yum_update")
-      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 :InstallOriginBaseDependencies, action_root.join("install_origin_base_dependencies")
+      autoload :InstallOriginAssetDependencies, action_root.join("install_origin_asset_dependencies")
+      autoload :BuildOriginBaseImages, action_root.join("build_origin_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 :InstallOrigin, action_root.join("install_origin")
+      autoload :InstallOriginRhel7, action_root.join("install_origin_rhel7")
+      autoload :BuildOrigin, action_root.join("build_origin")
       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 :LocalOpenshiftCheckout, action_root.join("local_openshift_checkout")
+      autoload :LocalOriginCheckout, action_root.join("local_origin_checkout")
       autoload :CreateBareRepoPlaceholders, action_root.join("create_bare_repo_placeholders")
-      autoload :RunOpenshiftTests, action_root.join("run_openshift_tests")
+      autoload :RunOriginTests, action_root.join("run_origin_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 :DownloadArtifactsOpenshift, action_root.join("download_artifacts_openshift")
+      autoload :DownloadArtifactsOrigin, action_root.join("download_artifacts_origin")
       autoload :DownloadArtifactsSti, action_root.join("download_artifacts_sti")
       autoload :TestExitCode, action_root.join("test_exit_code")
       autoload :CleanNetworkSetup, action_root.join("clean_network_setup")

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

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class BuildOpenshift
+      class BuildOrigin
         include CommandHelper
 
         def initialize(app, env, options)
@@ -29,13 +29,13 @@ module Vagrant
         def call(env)
           if @options[:images]
             cmd = %{
-echo "Performing openshift release build with images..."
+echo "Performing origin release build with images..."
 set -e
 make release
 }
           else
             cmd = %{
-echo "Performing openshift release build..."
+echo "Performing origin release build..."
 set -e
 make release-binaries
 }
@@ -63,4 +63,4 @@ popd
       end
     end
   end
-end
+end

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

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

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

@@ -30,10 +30,10 @@ module Vagrant
           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
-          }}
+%{Host github.com
+StrictHostKeyChecking no
+UserKnownHostsFile=/dev/null
+}}
 
           git_clone_commands = "set -e\n"
           Constants.repos(env).each do |repo_name, url|
@@ -60,4 +60,4 @@ fi
       end
     end
   end
-end
+end

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

@@ -27,9 +27,9 @@ module Vagrant
 
         def call(env)
           remote_write(env[:machine], "/root/.ssh/config", "root:root", "0600") {
-            %{Host github.com
-   StrictHostKeyChecking no
-   UserKnownHostsFile=/dev/null
+%{Host github.com
+StrictHostKeyChecking no
+UserKnownHostsFile=/dev/null
 }}
 
           git_clone_commands = ""
@@ -50,4 +50,4 @@ module Vagrant
       end
     end
   end
-end
+end

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

@@ -46,8 +46,8 @@ module Vagrant
 
           sudo(env[:machine], "yum -y install deltarpm", {fail_on_error: false})
           sudo(env[:machine], "yum -y install augeas")
+
           if is_centos
-            sudo(env[:machine], "yum install -y centos-release-SCL.x86_64 http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm")
             set_yum_repo(env, "/etc/yum.repos.d/openshift-deps.repo", "openshift-deps", "https://mirror.openshift.com/pub/openshift-v3/dependencies/centos7/x86_64/")
           end
 
@@ -55,6 +55,8 @@ module Vagrant
 
           unless is_fedora
             unless env[:machine].communicate.test("rpm -q epel-release")
+              sudo(env[:machine], "yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm")
+
               #Workaround broken RHEL image which does not recover after restart.
               if "VagrantPlugins::AWS::Provider" == env[:machine].provider.class.to_s
                 remote_write(env[:machine], "/etc/rc.local") {

data/lib/vagrant-openshift/action/{download_artifacts_openshift.rb → download_artifacts_origin.rb}

@@ -18,7 +18,7 @@ require 'pathname'
 module Vagrant
   module Openshift
     module Action
-      class DownloadArtifactsOpenshift
+      class DownloadArtifactsOrigin
         include CommandHelper
 
         def initialize(app, env)
@@ -42,8 +42,7 @@ module Vagrant
             "/tmp/openshift-cmd/"                  => artifacts_dir + "cmd/",
 
             "/data/src/github.com/openshift/origin/_output/local/releases/" => artifacts_dir + "release/",
-            "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/",
-            "/data/src/github.com/openshift/origin/assets/phantomjsdriver.log" => artifacts_dir + "e2e/phantomjsdriver.log",
+            "/data/src/github.com/openshift/origin/assets/test/tmp/screenshots/" => artifacts_dir + "screenshots/"
           }
 
           download_map.each do |source,target|
@@ -54,7 +53,7 @@ module Vagrant
               FileUtils.mkdir_p File.dirname(target.to_s)
             end
 
-            command = "/usr/bin/rsync -avz -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+            command = "/usr/bin/rsync -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
 
             if not system(command)
               machine.ui.warn "Unable to download artifacts"

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

@@ -48,7 +48,7 @@ module Vagrant
               FileUtils.mkdir_p File.dirname(target.to_s)
             end
 
-            command = "/usr/bin/rsync -avz -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
+            command = "/usr/bin/rsync -az -e 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{private_key_path}' --rsync-path='sudo rsync' #{ssh_info[:username]}@#{ssh_info[:host]}:#{source} #{target}"
 
             if not system(command)
               machine.ui.warn "Unable to download artifacts"

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

@@ -41,7 +41,7 @@ module Vagrant
           box_info = box_info_data[os][stage]
           box_info[:instance_name] = @options[:name].nil? ? 'openshift_origin_' + inst_ts : @options[:name]
           box_info[:os] = os
-          box_info[:vagrant_guest] = [:centos7, :rhel7, :rhelatomic7].include?(os) ? :redhat : os
+          box_info[:vagrant_guest] = [:centos7, :rhel7, :rhel7next, :rhelatomic7].include?(os) ? :redhat : os
           box_info[:port_mappings] = @options[:port_mappings]
 
           @openstack_creds_file = ENV['OPENSTACK_CREDS'].nil? || ENV['OPENSTACK_CREDS'] == '' ? "~/.openstackcred" : ENV['OPENSTACK_CREDS']
@@ -64,7 +64,7 @@ module Vagrant
             'instance_name' => box_info[:instance_name],
             'os' => os,
             'dev_cluster' => false,
-            'insert_key' => ((stage == :inst) || (stage == :bootstrap)) && !@options[:no_insert_key],
+            'insert_key' => (stage == :inst) && !@options[:no_insert_key],
             'num_minions' => 2,
             'cpus' => 2,
             'memory' => 2048,
@@ -74,9 +74,7 @@ module Vagrant
           }
 
           vagrant_openshift_config['no_synced_folders'] = @options[:no_synced_folders]
-          if @options[:no_synced_folders]
-            vagrant_openshift_config[:no_synced_folders] = true
-          else
+          unless  @options[:no_synced_folders]
             vagrant_openshift_config['sync_to']   = '/data/src'
             vagrant_openshift_config['sync_from'] = "#{gopath}/src"
           end

data/lib/vagrant-openshift/action/{install_openshift.rb → install_origin.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshift
+      class InstallOrigin
         include CommandHelper
         def initialize(app, env)
           @app = app

data/lib/vagrant-openshift/action/{install_openshift_asset_dependencies.rb → install_origin_asset_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshiftAssetDependencies
+      class InstallOriginAssetDependencies
         include CommandHelper
 
         def initialize(app, env, options)
@@ -46,7 +46,7 @@ fi
   # copy them to the assets dir
   cp -rf $ASSET_BACKUP_DIR/node_modules $ORIGIN_PATH/assets/node_modules
   cp -rf $ASSET_BACKUP_DIR/bower_components $ORIGIN_PATH/assets/bower_components
-  
+
 }
           end
 

data/lib/vagrant-openshift/action/{install_openshift_base_dependencies.rb → install_origin_base_dependencies.rb}

@@ -17,7 +17,7 @@
 module Vagrant
   module Openshift
     module Action
-      class InstallOpenshiftBaseDependencies
+      class InstallOriginBaseDependencies
         include CommandHelper
 
         def initialize(app, env)
@@ -39,10 +39,7 @@ fi
           end
 
           ssh_user = env[:machine].ssh_info[:username]
-          # FIXME: Move 'openshift/centos-mongodb' into openshift org and then
-          #        add the image into 'repositories' constants
-          #
-          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat unzip Xvfb ethtool", {:timeout=>60*20})
+          sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 ntp screen java-1.?.0-openjdk bind-utils socat unzip Xvfb ethtool openldap-clients jq", {:timeout=>60*20})
           sudo(env[:machine], "yum install -y facter", {fail_on_error: false, :timeout=>60*10})
 
           # Install Chrome and chromedriver for headless UI testing
@@ -57,7 +54,7 @@ rpm --import linux_signing_key.pub
 yum-config-manager --add-repo=http://dl.google.com/linux/chrome/rpm/stable/x86_64
 
 # Install chrome
-yum install -y google-chrome-stable 
+yum install -y google-chrome-stable
 
 # Install chromedriver
 wget https://chromedriver.storage.googleapis.com/2.16/chromedriver_linux64.zip
@@ -102,25 +99,30 @@ mkdir -p /data/bin
 GO_VERSION=($(go version))
 echo "Detected go version: $(go version)"
 
-# TODO: Remove for go1.5, go vet and go cover will be internal 
+# TODO: Remove for go1.5, go vet and go cover will be internal
 if [[ ${GO_VERSION[2]} == "go1.4"* ]]; then
   GOPATH=/data go get golang.org/x/tools/cmd/cover
 
   GOPATH=/data go get golang.org/x/tools/cmd/vet
 
   # Check out a stable commit for go vet in order to version lock it to something we can work with
-  pushd /data/src/golang.org/x/tools >/dev/null 2>&1
-    git checkout c262de870b618eed648983aa994b03bc04641c72 
-  popd >/dev/null 2>&1
-
-  # Re-install using this version of the tool
-  GOPATH=/data go install golang.org/x/tools/cmd/vet
+  pushd /data/src/golang.org/x/tools >/dev/null
+    if git checkout c262de870b618eed648983aa994b03bc04641c72
+    then
+      # Re-install using this version of the tool
+      GOPATH=/data go install golang.org/x/tools/cmd/vet
+    fi
+  popd >/dev/null
 fi
 
 chown -R #{ssh_user}:#{ssh_user} /data
 
 sed -i "s,^#DefaultTimeoutStartSec=.*,DefaultTimeoutStartSec=240s," /etc/systemd/system.conf
 
+# Docker 1.8.2 now sets a TimeoutStartSec of 1 minute.  Unfortunately, for some
+# reason the initial docker start up is now taking > 5 minutes.  Until that is fixed need this.
+sed -i 's,TimeoutStartSec=.*,TimeoutStartSec=10min,'  /usr/lib/systemd/system/docker.service
+
 systemctl daemon-reexec
 systemctl daemon-reload
 systemctl enable docker