vagrant-openshift 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05edc816ea3867fcd242b1ab2fc58a34104f65fb
-  data.tar.gz: 41b8d65098b4c85bb978bb8c3d0c0f61fdcaf724
+  metadata.gz: 1d5a7c4fe915cc96802a766de32c019d988dd6b9
+  data.tar.gz: 895d89041785dcac418956e3030f3bc0aebfb362
 SHA512:
-  metadata.gz: d23f49c892ec3a715066f3f662539bdd1ce345bed566c14158fc679284e004441530d0279b1c2507150bcedcbb27108b29ebf622e54a2d7e2adccf05642879a4
-  data.tar.gz: c81b286fe9dd4fe7101a5895e28520ca3b531e933b1c0cc73656057c75f89466a562128189a590dd459d536900d29295974e938c7a0d8d81fd2b8019405b34d1
+  metadata.gz: 94e8371d89e8cad77fff11fc7cc443511b9fccbe43d5ddac60ce5b78e84b4c945c5f18137559052ac5152b62c4248d3a39cb1fe411d722aeb330b3777e338a69
+  data.tar.gz: 3a3c703c08ef457df079b81dedb6585285ddee254c05f74aa63ba937e82cdd21672d2e874e7ea1fb2c0d346441d92a1a7d3f3b9d05b31718008d35ded706ea17

data/README.asciidoc

@@ -37,11 +37,20 @@ link:http://gembundler.com[Bundler] to get the dependencies:
 $ bundle
 ----
 
-Compile and install using Rake:
+Compile using Rake:
 
 [source, sh]
 ----
-$ rake
+$ bundle exec rake
+----
+
+NOTE: If at this point a warning like `git://github.com/mitchellh/vagrant.git (at master) is not yet checked out. Run bundle install first.` appears, run `bundle install` and then re-run `bundle exec rake`. The warning will most likely not go away, but it is safe to proceed regardless.
+
+Install the plugin using Vagrant:
+
+[source,sh]
+----
+$ vagrant plugin install pkg/vagrant-openshift-<release>.gem
 ----
 
 ===== From rubygems.org
@@ -136,8 +145,8 @@ $ vagrant test-origin --all
 
 === Developer environment
 
-To enable easy customization of the build environment, any files placed under '\~/.openshiftdev/home.d' will be copied to
-the vagrant user home directory. For example: '~/.openshiftdev/home.d/.bash_profile' will be copied to '.bash_profile'
+To enable easy customization of the build environment, any files placed under `\~/.openshiftdev/home.d` will be copied to
+the vagrant user home directory. For example: `~/.openshiftdev/home.d/.bash_profile` will be copied to `.bash_profile`
 on the vagrant VM.
 
 
@@ -169,7 +178,6 @@ You now need some AWS-specific configuration to specify which AMI to use.
 
 * Ensure your AWS credentials file is present at `~/.awscred`; it should have the following entries filled in:
 
-.'~/.awscred'
 ----
 AWSAccessKeyId=<AWS API Key>
 AWSSecretKey=<AWS API Secret>
@@ -221,7 +229,6 @@ NOTE: On some systems (e.g. mac) doing `export NOKOGIRI_USE_SYSTEM_LIBRARIES=1`
 
 * Edit `~/.openstackcred` and update your OpenStack credentials, endpoint and tenant name.
 
-.'~/.openstackcred'
 ----
 OSEndpoint=<OpenStack Endpoint URL, e.g. http://openshift.example.com:5000/v2.0/tokens>
 OSUsername=<OpenStack Username>
@@ -237,7 +244,6 @@ OSFloatingIPPool=<specific pool or 'false' (to use first found) if floating ip i
   section. You'll need to indicate at least the base image
   you'd like to start, as well as the user to access with.
 
-.'.vagrant-openshift.json'
 ----
   "openstack": {
     "image": "Fedora-Cloud-Base-20141203-21.x86_64",

data/lib/vagrant-openshift/action.rb

@@ -169,7 +169,7 @@ module Vagrant
         Vagrant::Action::Builder.new.tap do |b|
           b.use RunOriginTests, options
           if options[:download]
-            b.use DownloadArtifactsOrigin
+            b.use DownloadArtifactsOrigin, options
           end
           b.use TestExitCode
         end
@@ -197,7 +197,7 @@ module Vagrant
 
       def self.download_origin_artifacts(options)
         Vagrant::Action::Builder.new.tap do |b|
-          b.use DownloadArtifactsOrigin
+          b.use DownloadArtifactsOrigin, options
         end
       end
 

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

@@ -21,9 +21,10 @@ module Vagrant
       class DownloadArtifactsOrigin
         include CommandHelper
 
-        def initialize(app, env)
+        def initialize(app, env, options)
           @app = app
           @env = env
+          @options = options.clone
         end
 
         def call(env)
@@ -39,10 +40,13 @@ module Vagrant
             "/var/log/audit/audit.log"       => artifacts_dir + "audit.log",
             "/tmp/openshift/"                => artifacts_dir,
 
-            "/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/"
           }
 
+          if @options[:download_release]
+            download_map["/data/src/github.com/openshift/origin/_output/local/releases/"] = artifacts_dir + "release/"
+          end
+
           download_map.each do |source,target|
             if ! machine.communicate.test("sudo ls #{source}")
               machine.ui.info "#{source} did not exist on the remote system.  This is often the case for tests that were not run."

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

@@ -93,6 +93,7 @@ fi
                                 openvswitch \
                                 rubygems \
                                 screen \
+                                ShellCheck \
                                 socat \
                                 sqlite-devel \
                                 sysstat \
@@ -193,9 +194,9 @@ systemctl enable ntpd
 groupadd -f docker
 usermod -a -G docker #{ssh_user}
 
-sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.0.0/16 \\1'," /etc/sysconfig/docker
-sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=172.30.0.0/16 -\\1'," /etc/sysconfig/docker
-sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='--insecure-registry=ci.dev.openshift.redhat.com:5000 -\\1'," /etc/sysconfig/docker
+ADDITIONAL_OPTIONS='--insecure-registry=172.30.0.0/16 --insecure-registry=ci.dev.openshift.redhat.com:5000'
+sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='${ADDITIONAL_OPTIONS} \\1'," /etc/sysconfig/docker
+sed -i "s,^OPTIONS=-\\(.*\\),OPTIONS='${ADDITIONAL_OPTIONS} -\\1'," /etc/sysconfig/docker
 sed -i "s,^ADD_REGISTRY='\\(.*\\)',#ADD_REGISTRY='--add-registry=docker.io \\1'," /etc/sysconfig/docker
 
 cat /etc/sysconfig/docker
@@ -219,10 +220,10 @@ then
 
   sudo lvcreate -n openshift-xfs-vol-dir -l 100%FREE /dev/${VG}
   sudo mkfs.xfs /dev/${VG}/openshift-xfs-vol-dir
-  sudo mkdir -p /tmp/openshift/xfs-vol-dir
-  sudo sh -c "echo /dev/${VG}/openshift-xfs-vol-dir /tmp/openshift/xfs-vol-dir xfs gquota 1 1 >> /etc/fstab"
-  sudo mount /tmp/openshift/xfs-vol-dir
-  sudo chown -R #{ssh_user}:#{ssh_user} /tmp/openshift
+  sudo mkdir -p /mnt/openshift-xfs-vol-dir
+  sudo sh -c "echo /dev/${VG}/openshift-xfs-vol-dir /mnt/openshift-xfs-vol-dir xfs gquota 1 1 >> /etc/fstab"
+  sudo mount /mnt/openshift-xfs-vol-dir
+  sudo chown -R #{ssh_user}:#{ssh_user} /mnt/openshift-xfs-vol-dir
 fi
 
 # Force socket reuse

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

@@ -31,7 +31,7 @@ module Vagrant
           if is_rhel
             ssh_user = env[:machine].ssh_info[:username]
             sudo(env[:machine], %{
-set -x
+set -ex
 
 # inside temporary directory create docker build context for the new base image
 contextdir=$(mktemp -d)
@@ -42,6 +42,10 @@ cp /var/lib/yum/*.pem $contextdir/certs
 cp /etc/yum/vars/* $contextdir/vars
 cp /etc/yum.repos.d/* $contextdir/repos
 
+# yum magic that auto-replaces REGION in repos doesn't work
+# when running inside a docker container, so harcode the value.
+sed -i s/REGION.aws.ce.redhat.com/us-east-1.aws.ce.redhat.com/ $contextdir/repos/redhat-rhui*
+
 # remove google chrome repo
 rm -rf $contextdir/repos/*chrome*.repo
 
@@ -83,6 +87,9 @@ EOF
 
 docker build --rm -t rhel7.2 $contextdir
 
+# make sure the new rhel7.2 image has valid certs
+docker run rhel7.2 yum install -y tar
+
 # cleaning
 rm -rf $contextdir
             })

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

@@ -31,6 +31,10 @@ module Vagrant
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant download-artifacts-origin [machine-name]"
             o.separator ""
+
+            o.on("", "--include-release-artifacts", String, "Include release binaries") do |f|
+              options[:download_release] = true
+            end
           end
 
           # Parse the options

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

@@ -59,6 +59,10 @@ module Vagrant
               options[:download] = true
             end
 
+            o.on("", "--download-release-artifacts", String, "Download release binaries") do |f|
+              options[:download_release] = true
+            end
+
             o.on("-s","--skip-image-cleanup", String, "Skip Docker image teardown for E2E test") do |f|
               options[:skip_image_cleanup] = true
             end

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "3.0.5"
+    VERSION = "3.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake