vagrant-openshift 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d5a7c4fe915cc96802a766de32c019d988dd6b9
-  data.tar.gz: 895d89041785dcac418956e3030f3bc0aebfb362
+  metadata.gz: b3fe170f2452ac6b16bb9b59aae8b97b545d4fc2
+  data.tar.gz: 19294c1010b526c4b390e8a365066b115e0bd936
 SHA512:
-  metadata.gz: 94e8371d89e8cad77fff11fc7cc443511b9fccbe43d5ddac60ce5b78e84b4c945c5f18137559052ac5152b62c4248d3a39cb1fe411d722aeb330b3777e338a69
-  data.tar.gz: 3a3c703c08ef457df079b81dedb6585285ddee254c05f74aa63ba937e82cdd21672d2e874e7ea1fb2c0d346441d92a1a7d3f3b9d05b31718008d35ded706ea17
+  metadata.gz: 108a4d36deec143097fc7b8f5379f796f5ed70271809a0d9e94adea90694e5c22ed0d503da7312e812e2be695f8ca5d7a4d7a4162c09be0d736961c3358e4743
+  data.tar.gz: fb31ad53478510a18bb165e3fa69f19df98fa1254086dd9f2d211ce1fb17114f068f7352e6395456b4ab80e9ceaab05d616ecce45d131a8be62daaa6ae168a82

data/README.asciidoc

@@ -46,7 +46,7 @@ $ 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:
+Install the plugin using Vagrant (only necessary if `bundle exec rake` still failed with the above noted warning):
 
 [source,sh]
 ----

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

@@ -55,7 +55,7 @@ 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")
+              sudo(env[:machine], "yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm")
 
               #Workaround broken RHEL image which does not recover after restart.
               if "VagrantPlugins::AWS::Provider" == env[:machine].provider.class.to_s

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

@@ -122,8 +122,9 @@ module Vagrant
 
             aws_compute = Fog::Compute.new(fog_config)
             @env[:ui].info("Searching for latest base AMI")
-            images = aws_compute.images.all({'Owner' => 'self', 'name' => "#{box_info[:aws][:ami_tag_prefix]}*",
-                                             'state' => 'available' })
+            image_filter = {'Owner' => 'self', 'name' => "#{box_info[:aws][:ami_tag_prefix]}*", 'state' => 'available' }
+            image_filter['tag:Name'] = @options[:required_name_tag] unless @options[:required_name_tag].nil?
+            images = aws_compute.images.all(image_filter)
             latest_image = images.sort_by{ |i| i.name.split("_")[-1].to_i }.last
             box_info[:aws][:ami] = latest_image.id
             @env[:ui].info("Found: #{latest_image.id} (#{latest_image.name})")

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

@@ -28,7 +28,7 @@ module Vagrant
         def call(env)
           sudo env[:machine], "rm -rf /etc/yum.repos.d/openshift-origin.repo"
           sudo env[:machine], "yum clean all"
-          sudo env[:machine], "yum -y update --skip-broken --exclude=kernel*", {fail_on_error: false, :timeout=>60*30}
+          sudo env[:machine], "yum -y update --exclude=kernel*", {fail_on_error: false, :timeout=>60*30}
           sudo env[:machine], "yum list installed"
 
           env[:machine].ui.warn "Increasing YUM cache timeout to 9999999. You will need manually clear cache to get additional updates."

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

@@ -34,7 +34,8 @@ module Vagrant
             :volume_size => 25,
             :port_mappings => [],
             :no_synced_folders => false,
-            :no_insert_key => false
+            :no_insert_key => false,
+            :required_name_tag => nil
           }
 
           valid_stage = ['os','deps','inst']
@@ -71,6 +72,11 @@ module Vagrant
             o.on('--volume-size', "--volume-size [size]", String, "Specify the volume size for the instance") do |f|
               options[:volume_size] = f.to_i
             end
+
+            o.on("--required-name-tag [name]", String, "Specify name tag to match against images, if supported") do |f|
+              name_tag = f.strip
+              options[:required_name_tag] = name_tag unless name_tag.empty?
+            end
           end
 
           # Parse the options

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

@@ -140,21 +140,27 @@ popd
           if @options[:replace]
             command += %{
 echo 'Replacing: #{repo_path}'
-rm -rf #{repo_path}
+pushd #{repo_path}
+  git fetch origin
+  git reset --hard origin/master
+  git clean -fdx
+  set +e
+  git branch | grep -ve " master$" | xargs git branch -D
+  set -e
+popd
 }
           else
             command += "echo 'Already cloned: #{repo}'\n"
           end
-        end
-
-        command += %{
+        else
+          command += %{
 cloned=false
 echo 'Cloning #{repo} ...'
 }
 
-        if @options[:user]
-          user_repo_url="git@github.com:#{@options[:user]}/#{repo}"
-          command += %{
+          if @options[:user]
+            user_repo_url="git@github.com:#{@options[:user]}/#{repo}"
+            command += %{
 echo 'Cloning #{user_repo_url}'
 git clone --quiet #{user_repo_url}
 if [ $? -eq 0 ]; then
@@ -165,11 +171,12 @@ echo 'Fork of repo #{repo} not found. Cloning read-only copy from upstream'
 fi
 }
 
-        end
-        command += %{
+          end
+          command += %{
 [ $cloned != true ] && git clone --quiet #{url}
 ( cd #{repo} && git checkout #{@options[:branch]} &>/dev/null)
 }
+        end
 
         command
       end

data/lib/vagrant-openshift/version.rb

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

metadata

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