rouster 0.71 → 0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc35059dfd069465564f8bfc05e73691eeae808
-  data.tar.gz: 7bdf52d6fbc039e0eeedb7082c074554af63ecbb
+  metadata.gz: d8c7f2c8225ca7d04cc4f189c8006a766c6ab74c
+  data.tar.gz: 5553e3c49f5515fe2bd4d9f482af86e42f93a8b5
 SHA512:
-  metadata.gz: eff286e080ac8cfaf0cbcdc23c5488ec879860f613cf01009dd5b1d24cd02c918c9fb54f705e863bfdfb948bcdbb84b717099915de4e89b54524c9fe002a5556
-  data.tar.gz: eddbbc417d46c8e1fb8235a188170f3d2599f4eb0f43bae13ab1746e15b155314a15f8531199b9867955f3df052dfbfa9c2cc8e53cd474694a4724c131234e2d
+  metadata.gz: edd74f17458fad3b4632fc5dd54fd5e1c95c7e4e0d344d67fbde49dcc4daeee11b20180851b57e7f416f65d4181853c5fef4a46310b97c536467c10bcef4f1de
+  data.tar.gz: 8b8ca2d25f3295e98001911cc151df6c73952d5d3e0d77dbc0de6bc4524d2c9b4f747d84cb7b0da9f3afcb7d962aef35f62acb923eea8df2946cc7fb31a6eeda

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 
 gem 'json'
 gem 'log4r', '~> 1.1.9'
-gem 'net-scp'
-gem 'net-ssh'
+gem 'net-scp', '= 1.2.1'
+gem 'net-ssh', '= 2.9.4'
 gem 'rake', '= 10.4.2'
 
 group :development do

data/Gemfile.lock

@@ -61,7 +61,7 @@ GEM
     multi_json (1.10.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-ssh (2.9.4)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     parser (2.3.3.0)
@@ -89,8 +89,8 @@ DEPENDENCIES
   fog (= 1.24.0)
   json
   log4r (~> 1.1.9)
-  net-scp
-  net-ssh
+  net-scp (= 1.2.1)
+  net-ssh (= 2.9.4)
   rake (= 10.4.2)
   reek (= 3.10.2)
   test-unit (~> 3.0.0)
@@ -99,4 +99,4 @@ RUBY VERSION
    ruby 2.0.0p648
 
 BUNDLED WITH
-   1.13.6
+   1.15.4

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.71
+  VERSION = 0.72
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -455,9 +455,10 @@ class Rouster
             @ssh = Net::SSH.start(
               @passthrough[:host],
               @passthrough[:user],
-              :port => @passthrough[:ssh_port],
-              :keys => [ @passthrough[:key] ], # TODO this should be @sshkey
-              :paranoid => false
+              :port                       => @passthrough[:ssh_port],
+              :keys                       => [ @passthrough[:key] ], # TODO this should be @sshkey
+              :paranoid                   => false,
+              :number_of_password_prompts => 0
             )
             break
           rescue => e

data/lib/rouster/deltas.rb

@@ -150,7 +150,7 @@ class Rouster
     }.each_pair do |source, raw|
 
       raw.split("\n").each do |line|
-        next unless line.match(/\w+:\w+:\w+/)
+        next unless line.match(/\w+:\w*:\w+/)
 
         data = line.split(':')
 
@@ -772,7 +772,7 @@ class Rouster
     }.each do |source, raw|
 
       raw.split("\n").each do |line|
-        next if line.match(/(\w+)(?::\w+){3,}/).nil?
+        next if line.match(/([\w\.-]+)(?::\w+){3,}/).nil?
 
         user = $1
         data = line.split(':')
@@ -784,11 +784,11 @@ class Rouster
         gid         = data[3]
 
         if res.has_key?(user)
-          @logger.info(sprintf('for[%s] old shell[%s], new shell[%s]', res[user][:shell], shell)) unless shell.eql?(res[user][:shell])
-          @logger.info(sprintf('for[%s] old home[%s], new home[%s]', res[user][:home], home)) unless home.eql?(res[user][:home])
-          @logger.info(sprintf('for[%s] old home_exists[%s], new home_exists[%s]', res[user][:home_exists], home_exists)) unless home_exists.eql?(res[user][:home_exists])
-          @logger.info(sprintf('for[%s] old UID[%s], new UID[%s]', res[user][:uid], uid)) unless uid.eql?(res[user][:uid])
-          @logger.info(sprintf('for[%s] old GID[%s], new GID[%s]', res[user][:gid], gid)) unless gid.eql?(res[user][:gid])
+          @logger.info(sprintf('for[%s] old shell[%s], new shell[%s]', user, res[user][:shell], shell)) unless shell.eql?(res[user][:shell])
+          @logger.info(sprintf('for[%s] old home[%s], new home[%s]', user, res[user][:home], home)) unless home.eql?(res[user][:home])
+          @logger.info(sprintf('for[%s] old home_exists[%s], new home_exists[%s]', user, res[user][:home_exists], home_exists)) unless home_exists.eql?(res[user][:home_exists])
+          @logger.info(sprintf('for[%s] old UID[%s], new UID[%s]', user, res[user][:uid], uid)) unless uid.eql?(res[user][:uid])
+          @logger.info(sprintf('for[%s] old GID[%s], new GID[%s]', user, res[user][:gid], gid)) unless gid.eql?(res[user][:gid])
         end
 
         res[user] = Hash.new()

data/plugins/openstack.rb

@@ -36,8 +36,15 @@ class Rouster
       @logger.debug(sprintf('Connecting to running instance [%s] while calling ostack_up()', self.passthrough[:instance]))
       self.connect_ssh_tunnel
     else
-      server = @nova.servers.create(:name => @name, :flavor_ref => @passthrough[:flavor_ref],
+      if @passthrough[:openstack_net_id]
+        # if the user has set a net id, send it along
+        server = @nova.servers.create(:name => @name, :flavor_ref => @passthrough[:flavor_ref],
+                  :image_ref => @passthrough[:image_ref], :nics => [{:net_id => @passthrough[:openstack_net_id] }], 
+                  :key_name => @passthrough[:keypair], :user_data => @passthrough[:user_data])
+      else
+        server = @nova.servers.create(:name => @name, :flavor_ref => @passthrough[:flavor_ref],
                   :image_ref => @passthrough[:image_ref], :key_name => @passthrough[:keypair], :user_data => @passthrough[:user_data])
+      end
       server.wait_for { ready? }
       @instance_data = server
       server.addresses.each_key do |address_key|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.71'
+  version: '0.72'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: Rouster
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rouster is an abstraction layer for Vagrant