vagrant-atomic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d523aeffa2fcd11c193b168e33a378f0ac0936b2
-  data.tar.gz: e4467f2af59031ae7b203937b463807c900f0be0
+  metadata.gz: 7ae89fcd9e176e407d8a9904de9aeccc22688e12
+  data.tar.gz: 75d69780dc27429a6011fffd193d07babbace82e
 SHA512:
-  metadata.gz: 2554bb4fe269998ac5ee540784095a533a9c7c016f736cb5ffa94f2ffd7c89de19e91133b2f6320e6cb0c8b453653a4a821d8f8cd7e1de0111181cb90f445d51
-  data.tar.gz: ed7cbe454e929809476b0493bec54384c5e2e232ce8b349c315f3101e0f266ac9f9a1244217c85aa04669778615e7b91e08789f9000d38d9c63cec7a82cd3828
+  metadata.gz: a30c23f402f5cdd2bdf46b35a70fdacd72053a282799a80b4e8b8aba8592039d5aa6f84d89170060c59b1e5bca1ddb4b5f6c9ef3b795d4644a3c7bbd2eb6125c
+  data.tar.gz: f782d0fbf06939c5675c6fec5838499da64733f49bdace3939208d006593484b2eda27d8bd66765728fe03ef36a3fbc8d0188964d6222f5fda64b6d201c2886b

data/.gitignore

@@ -8,7 +8,8 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
-
+.idea/**
+.project
 ## Specific to RubyMotion:
 .dat*
 .repl_history

data/lib/vagrant-atomic/guest.rb

@@ -4,7 +4,13 @@ module VagrantPlugins
   module GuestAtomic
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("cat /etc/os-release | grep Atomic")
+	# For now we use this non 100% bullet proof solution.
+	# Bugs issued to include word atomic in upstream releases
+	# Centos: http://bugs.centos.org/view.php?id=8288
+	# Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1200122
+	#
+	# machine.communicate.test("cat /etc/os-release | grep Atomic")
+        machine.communicate.test("which rpm-ostree")
       end
     end
   end

data/lib/vagrant-atomic/plugin.rb

@@ -20,11 +20,6 @@ module VagrantPlugins
         Cap::ChangeHostName
       end
 
-      guest_capability("atomic", "configure_networks") do
-        require_relative "cap/configure_networks"
-        Cap::ConfigureNetworks
-      end
-
       guest_capability("atomic", "docker_daemon_running") do
         require_relative "cap/docker"
         Cap::Docker

data/lib/vagrant-atomic/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GuestAtomic
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-atomic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Langdon White
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies: []
 description: Enables the Project Atomic OS (http://projectatomic.io) as a guest for
   vagrant. Tested with Fedora Atomic and RHEL Atomic
@@ -18,23 +18,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- CHANGELOG.md
-- Gemfile
+- vagrant-atomic.gemspec
 - LICENSE
 - README.md
-- Rakefile
 - Vagrantfile
 - lib/vagrant-atomic.rb
+- lib/vagrant-atomic/plugin.rb
+- lib/vagrant-atomic/guest.rb
+- lib/vagrant-atomic/cap/unregister.rb
+- lib/vagrant-atomic/cap/register.rb
 - lib/vagrant-atomic/cap/change_host_name.rb
-- lib/vagrant-atomic/cap/configure_networks.rb
 - lib/vagrant-atomic/cap/docker.rb
-- lib/vagrant-atomic/cap/register.rb
-- lib/vagrant-atomic/cap/unregister.rb
-- lib/vagrant-atomic/guest.rb
-- lib/vagrant-atomic/plugin.rb
 - lib/vagrant-atomic/version.rb
-- vagrant-atomic.gemspec
+- CHANGELOG.md
+- Rakefile
+- Gemfile
+- .gitignore
 homepage: 
 licenses:
 - GPL-2.0
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-atomic
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables the Project Atomic OS (http://projectatomic.io) as a guest for vagrant

data/lib/vagrant-atomic/cap/configure_networks.rb

@@ -1,98 +0,0 @@
-require "set"
-require "tempfile"
-
-require "vagrant/util/retryable"
-require "vagrant/util/template_renderer"
-
-module VagrantPlugins
-  module GuestAtomic
-    module Cap
-      class ConfigureNetworks
-        extend Vagrant::Util::Retryable
-        include Vagrant::Util
-
-        def self.configure_networks(machine, networks)
-          network_scripts_dir = machine.guest.capability("network_scripts_dir")
-
-          virtual = false
-          interface_names = Array.new
-          machine.communicate.sudo("/usr/sbin/biosdevname; echo $?") do |_, result|
-            virtual = true if result.chomp == '4'
-          end
-
-          if virtual
-            machine.communicate.sudo("ls /sys/class/net | grep -v lo") do |_, result|
-              interface_names = result.split("\n")
-            end
-
-            interface_names = networks.map do |network|
-               "eth#{network[:interface]}"
-            end
-          else
-            machine.communicate.sudo("/usr/sbin/biosdevname -d | grep Kernel | cut -f2 -d: | sed -e 's/ //;'") do |_, result|
-              interface_names = result.split("\n")
-            end
-
-            interface_name_pairs = Array.new
-            interface_names.each do |interface_name|
-              machine.communicate.sudo("/usr/sbin/biosdevname --policy=all_ethN -i #{interface_name}") do |_, result|
-                interface_name_pairs.push([interface_name, result.gsub("\n", "")])
-              end
-            end
-
-            setting_interface_names = networks.map do |network|
-               "eth#{network[:interface]}"
-            end
-
-            interface_name_pairs.each do |interface_name, previous_interface_name|
-              if setting_interface_names.index(previous_interface_name) == nil
-                interface_names.delete(interface_name)
-              end
-            end
-          end
-
-          # Accumulate the configurations to add to the interfaces file as well
-          # as what interfaces we're actually configuring since we use that later.
-          interfaces = Set.new
-          networks.each do |network|
-            interface = interface_names[network[:interface]-1]
-            interfaces.add(interface)
-            network[:device] = interface
-
-            # Remove any previous vagrant configuration in this network
-            # interface's configuration files.
-            machine.communicate.sudo("touch #{network_scripts_dir}/ifcfg-#{interface}")
-            machine.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-#{interface} > /tmp/vagrant-ifcfg-#{interface}")
-            machine.communicate.sudo("cat /tmp/vagrant-ifcfg-#{interface} > #{network_scripts_dir}/ifcfg-#{interface}")
-            machine.communicate.sudo("rm -f /tmp/vagrant-ifcfg-#{interface}")
-
-            # Render and upload the network entry file to a deterministic
-            # temporary location.
-            entry = TemplateRenderer.render("guests/atomic/network_#{network[:type]}",
-                                            options: network)
-
-            temp = Tempfile.new("vagrant")
-            temp.binmode
-            temp.write(entry)
-            temp.close
-
-            machine.communicate.upload(temp.path, "/tmp/vagrant-network-entry_#{interface}")
-          end
-
-          # Bring down all the interfaces we're reconfiguring. By bringing down
-          # each specifically, we avoid reconfiguring p7p (the NAT interface) so
-          # SSH never dies.
-          interfaces.each do |interface|
-            retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
-              machine.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}")
-              machine.communicate.sudo("/sbin/ifdown #{interface}", error_check: true)
-              machine.communicate.sudo("/sbin/ifup #{interface}")
-            end
-
-            machine.communicate.sudo("rm -f /tmp/vagrant-network-entry_#{interface}")
-          end
-        end
-      end
-    end
-  end
-end