pero 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f1941626b9f892ebe021edc387601c571976a69ea65c936b7464943fe7024e
-  data.tar.gz: ec1bbb64db216abda864d2d72d1654efb36ab9f8d19f06b155104d4f50d99937
+  metadata.gz: c9fe7de2ca2e843f7c2af48b8b3804438aa9ba062145a456b1807b18c4405274
+  data.tar.gz: 6d98fb48aa4038a36b48ec9c26b2747c92ad732dc48b1ce3f34f94c6b8f769e9
 SHA512:
-  metadata.gz: '002196fd8e20ceb0ca7d1665e4155dd163c7bd63a7c093fef166d6eda6233e9126c9e33bff1310b80674a109f1478477a2a62d9ac819f64f2bc89c2d3e085026'
-  data.tar.gz: 8c49fc394ee3419d2b233f0776e90c1fe8cb75a15283628650aeb7a60e81a72312964d2b591d4d2191803b020cd2767023ef2a6041a39903ee0d23040af7c66f
+  metadata.gz: 2110591370d40c13810cedd3d770c03ec2229b1b8612b16e7ef96d69772f1739d9c2185cfe5c3ee51ad25ad368a7f104cdbf641d9e84dc306c6e0f5c3558ab10
+  data.tar.gz: b0b79c02857c85fee733f69d18ab31acc7c48d1931e2bf29e738c3e8366adf70e9d30ca2cd59b13ed57b9e2fa3bc49306f9088da129e9ecf51d3e5bd6afc4461

data/.gitignore

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

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/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,7 +86,7 @@ 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
 
@@ -94,8 +99,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 +115,20 @@ module Pero
       serve_master do |container|
         port = container.info["Ports"].first["PublicPort"]
         begin
-          tmpdir=(0...8).map{ (65 + rand(26)).chr }.join
+          tmpdir=container.info["id"][0..5]
           Pero.log.info "start forwarding port:#{port}"
 
           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

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor