pero 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80cef5729ae09df0448c266e6e5367f846bf2d9c1b335e0f35bf02b7437924fd
-  data.tar.gz: 51f5b3b7dd9630bede9fa570832d2a4825a9e959b69128cc5369480cd796447a
+  metadata.gz: 208ce0604ff4e559eecfa0452a556a17a61a0ea4f2084857f9e336a10dbe16ef
+  data.tar.gz: 5a99444148e96ff2eef5605eb699c781fc4508de74994c2ccc8f1fbb1a890b9e
 SHA512:
-  metadata.gz: 22104b9d4f8d1a8b3a594c93d8aaf352cc147bae97f988f44e6e4cd6fc7af899097c7ff6827c474afa520d2fc0af268b86131eecbacf2bf362885d5380b3ca52
-  data.tar.gz: 158cd30a1ce205662ca59a3d2676bc587d5da64b0ffc26ffc25bd860e60aeba2d24e6561469a6fbdd21cbe5e8469949df9b6790e3e5f269868839597730cc3a5
+  metadata.gz: 7fe6677270fa6df8285522185a25d3907622e932a273559e3960bc36c2e373120d144f488933203fb8c5a25a67cef0c4dafcb4b6b689c6da6d810beb24f9f90d
+  data.tar.gz: 3b7939123640c8b468713db68ae1f1aa5f21e847bceef42f6b4daf77f23c3871ccbe68a2072542081d192acc9b53e4589be1fe40acfb7add47dc387cbb298239

data/.gitignore

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

data/lib/pero/cli.rb

@@ -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

@@ -73,7 +73,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 +81,7 @@ module Pero
       else
           raise "sorry unsupport os, please pull request!!!"
       end
-      os.install(@options["agent-version"])
+      os.install(@options["agent-version"]) unless @options["agent-version"].empty?
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
@@ -94,8 +94,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 +110,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.1"
+  VERSION = "0.1.2"
 end

metadata

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