pero 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80cef5729ae09df0448c266e6e5367f846bf2d9c1b335e0f35bf02b7437924fd
-  data.tar.gz: 51f5b3b7dd9630bede9fa570832d2a4825a9e959b69128cc5369480cd796447a
+  metadata.gz: f970d0b7869fb40c3e86c2946655bd523971901322cf0e290647c2dbe0115a1b
+  data.tar.gz: f2a7c166a9feff206398f8e7dad567c24860cd7613f06a1f2a81f3ff6c9f55ac
 SHA512:
-  metadata.gz: 22104b9d4f8d1a8b3a594c93d8aaf352cc147bae97f988f44e6e4cd6fc7af899097c7ff6827c474afa520d2fc0af268b86131eecbacf2bf362885d5380b3ca52
-  data.tar.gz: 158cd30a1ce205662ca59a3d2676bc587d5da64b0ffc26ffc25bd860e60aeba2d24e6561469a6fbdd21cbe5e8469949df9b6790e3e5f269868839597730cc3a5
+  metadata.gz: 28ca76f64521f7529d63cb1c7bfd0ab2747ade30d3f0cbe247f6793a45e6c147e677086e896d925bd1fc2401d74bb1265bdd63c88dcd5c801d2c03496834fba0
+  data.tar.gz: fc59ba398210e11a801cafa509eb81c8db0dcb6e3837b78562a021f0face8741935ecff2b2d5cac021bd5940612524a3ff5a6d18197022bfb2e181a27aba098f

data/.gitignore

@@ -5,3 +5,4 @@ reports
 run
 yaml
 log
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pero (0.1.0)
+    pero (0.1.5)
       docker-api
       logger
       net-ssh
@@ -41,7 +41,7 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     sfl (2.3)
-    specinfra (2.82.18)
+    specinfra (2.82.19)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)

data/lib/pero/cli.rb

@@ -25,7 +25,7 @@ module Pero
       option :ask_password, type: :boolean, default: false, desc: "ask ssh or sudo password"
       option :vagrant, type: :boolean, default: false, desc: "use vagrarant"
       option :sudo, type: :boolean, default: true, desc: "use sudo"
-      option "concurrent", aliases: '-N',default: 3, type: :numeric, desc: "running concurrent"
+      option "concurrent", aliases: '-C',default: 3, type: :numeric, desc: "running concurrent"
     end
 
     desc "versions", "show support version"
@@ -50,11 +50,11 @@ module Pero
       end
     end
 
-    desc "install", "install puppet"
+    desc "bootstrap", "bootstrap pero"
     shared_options
-    option "agent-version", default: "6.17.0", type: :string
+    option "agent-version", type: :string
     option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
-    def install(*hosts)
+    def bootstrap(*hosts)
       Parallel.each(hosts, in_process: options["concurrent"]) do |host|
         next if host =~ /^-/
         puppet = Pero::Puppet.new(host, options)

data/lib/pero/docker.rb

@@ -45,6 +45,7 @@ module Pero
         'ExposedPorts' => { '8140/tcp' => {} },
       })
 
+      Pero.log.info "start puppet master container"
       container.start(
         'Binds' => [
           "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}",

data/lib/pero/puppet.rb

@@ -28,6 +28,11 @@ module Pero
 
       @options[:host] = host
       so = ssh_options
+
+      if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
+        so.delete(:strict_host_key_checking)
+      end
+
       @specinfra = Specinfra::Backend::Ssh.new(
         request_pty: true,
         host: so[:host_name],
@@ -73,7 +78,7 @@ module Pero
     end
 
     def install
-      Pero.log.info "bootstrap puppet"
+      Pero.log.info "bootstrap pero"
       osi = specinfra.os_info
       os = case osi[:family]
       when "redhat"
@@ -81,12 +86,11 @@ module Pero
       else
           raise "sorry unsupport os, please pull request!!!"
       end
-      os.install(@options["agent-version"])
+      os.install(@options["agent-version"]) if @options["agent-version"]
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
     def serve_master
-        Pero.log.info "start puppet master container"
         container = run_container
         begin
           yield container
@@ -94,8 +98,10 @@ module Pero
           Pero.log.error e.inspect
           raise e
         ensure
-          Pero.log.info "stop puppet master container"
-          container.kill if @options["one-shot"]
+          if @options["one-shot"]
+            Pero.log.info "stop puppet master container"
+            container.kill
+          end
         end
     end
 
@@ -108,20 +114,18 @@ module Pero
       serve_master do |container|
         port = container.info["Ports"].first["PublicPort"]
         begin
-          tmpdir=(0...8).map{ (65 + rand(26)).chr }.join
-          Pero.log.info "start forwarding port:#{port}"
-
+          tmpdir=container.info["id"][0..5]
           in_ssh_forwarding(port) do |host, ssh|
             Pero.log.info "#{host}:puppet cmd[#{puppet_cmd}]"
-            cmd = "unshare -m -- /bin/bash -c 'export PATH=$PATH:/opt/puppetlabs/bin/ &&  mkdir -p /tmp/puppet/#{tmpdir} && \
-                           mkdir -p `puppet config print ssldir`  && mount --bind /tmp/puppet/#{tmpdir} `puppet config print ssldir` && \
+            cmd = "mkdir -p /tmp/puppet/#{tmpdir} && unshare -m -- /bin/bash -c 'export PATH=$PATH:/opt/puppetlabs/bin/ && \
+                           mkdir -p `puppet config print ssldir` && mount --bind /tmp/puppet/#{tmpdir} `puppet config print ssldir` && \
                            #{puppet_cmd}'"
             Pero.log.debug "run cmd:#{cmd}"
             ssh.exec!(specinfra.build_command(cmd))  do |channel, stream, data|
                              Pero.log.info "#{host}:#{data.chomp}" if stream == :stdout && data.chomp != ""
                              Pero.log.warn "#{host}:#{data.chomp}" if stream == :stderr && data.chomp != ""
                            end
-            ssh.exec!(specinfra.build_command("rm -rf /tmp/puppet/#{tmpdir}"))
+            ssh.exec!(specinfra.build_command("rm -rf /tmp/puppet/#{tmpdir}")) if @options["one-shot"]
             ssh.loop {true} if ENV['PERO_DEBUG']
           end
         rescue => e
@@ -156,6 +160,7 @@ module Pero
         options.delete(:strict_host_key_checking)
       end
 
+      Pero.log.info "start forwarding #{specinfra.get_config(:host)}:8140 => localhost:#{port}"
       Net::SSH.start(
         specinfra.get_config(:host),
         options[:user],

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - pyama86