pero 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa74a079e1c3d2cc0c3aa0d6b0a005ea292a74df1097dd6460527f8a8c65d14
-  data.tar.gz: 1c1f4b7d993890c52755a4c1170765ff721e603ad62cf478efd88f0e5ccf3903
+  metadata.gz: ead39fbc282e03a7035b106c0e00c0fd763a9753dbc8726fdf60c4f135632947
+  data.tar.gz: 4acf8ddf945f939da41e9be7b0f0a4e1ea4f941d28824e8674771a5c1bf2af2c
 SHA512:
-  metadata.gz: 17fe04aa86b65181f667caf38f1afe17df2646a95bfbc2780bf3873159a44893200937f41ddcf8644fa697149d267f86368dd95e6780c7a4eed56c98dd845afb
-  data.tar.gz: 6648d3f545ef9ab8f2e2028221a1189151dd1baa339af9d608522af8bfaf836fdc05a6b662f728d358f8a0ee4071e968df6a6eabcecc8bac119dcbf37a590f80
+  metadata.gz: 260feaad123a26da33a14abfa8869e693ae0dafc0fa85e6286468c43ffd3c93b79608e5e0792f7048bf5dd05aea88ca4cc160e6827b71699284c62d0fb4cc158
+  data.tar.gz: 397a20a1d09cdaea967183770876fc2538c2c50729b98b7b2e4f1b4e8c254f294eafaaf75841408fe2121a6f41ac52cb521ea664fb830f1cb101cdcfb14dbc92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pero (0.1.0)
+    pero (0.1.6)
       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

@@ -30,7 +30,11 @@ module Pero
 
     desc "versions", "show support version"
     def versions
-      Pero::Puppet::Redhat.show_versions
+      begin
+        Pero::Puppet::Redhat.show_versions
+      rescue => e
+        Pero.log.error e.inspect
+      end
     end
 
     desc "apply", "puppet apply"
@@ -41,12 +45,17 @@ module Pero
     option :tags, default: nil, type: :array
     option "one-shot", default: false, type: :boolean, desc: "stop puppet server after run"
     def apply(name_regexp)
-      nodes = Pero::History.search(name_regexp)
-      return unless nodes
-      Parallel.each(nodes, in_process: options["concurrent"]) do |n|
-        opt = n["last_options"].merge(options)
-        puppet = Pero::Puppet.new(opt["host"], opt)
-        puppet.apply
+      begin
+        prepare
+        nodes = Pero::History.search(name_regexp)
+        return unless nodes
+        Parallel.each(nodes, in_process: options["concurrent"]) do |n|
+          opt = n["last_options"].merge(options)
+          puppet = Pero::Puppet.new(opt["host"], opt)
+          puppet.apply
+        end
+      rescue => e
+        Pero.log.error e.inspect
       end
     end
 
@@ -55,10 +64,21 @@ module Pero
     option "agent-version", type: :string
     option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
     def bootstrap(*hosts)
-      Parallel.each(hosts, in_process: options["concurrent"]) do |host|
-        next if host =~ /^-/
-        puppet = Pero::Puppet.new(host, options)
-        puppet.install
+      begin
+        Parallel.each(hosts, in_process: options["concurrent"]) do |host|
+          next if host =~ /^-/
+          puppet = Pero::Puppet.new(host, options)
+          puppet.install
+        end
+      rescue => e
+        Pero.log.error e.inspect
+      end
+    end
+
+    no_commands do
+      def prepare
+        `bundle insatll` if File.exists?("Gemfile")
+        `bundle exec librarian-puppet install` if File.exists?("Puppetfile")
       end
     end
   end

data/lib/pero/docker.rb

@@ -27,12 +27,17 @@ module Pero
       "pero-#{server_version}-#{Digest::MD5.hexdigest(Dir.pwd)[0..5]}-#{@environment}"
     end
 
-    def alerady_run?
+    def find
       ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}" && c.info["State"] != "exited"
+        c.info["Names"].first == "/#{container_name}"
       end
     end
 
+    def alerady_run?
+      c = find
+      c && c.info["State"] != "exited" && c
+    end
+
     def run
       ::Docker::Container.all(:all => true).each do |c|
         c.delete(:force => true) if c.info["Names"].first == "/#{container_name}"
@@ -45,6 +50,7 @@ module Pero
         'ExposedPorts' => { '8140/tcp' => {} },
       })
 
+      Pero.log.info "start puppet master container"
       container.start(
         'Binds' => [
           "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}",
@@ -53,15 +59,10 @@ module Pero
         'PortBindings' => {
           '8140/tcp' => [{ 'HostPort' => "0" }],
         },
-        "AutoRemove" => true,
       )
 
-      container = ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}"
-      end
-
+      container = find
       raise "can't start container" unless container
-
       begin
         Retryable.retryable(tries: 20, sleep: 5) do
           https = Net::HTTP.new('localhost', container.info["Ports"].first["PublicPort"])
@@ -77,10 +78,11 @@ module Pero
           raise e
         end
       rescue
-        container.kill
+        Pero.log.error "can't start container.please check [ docker logs #{container.info["id"]} ]"
+        container = find
+        container.kill if container && container.info["State"] != "exited"
         raise "can't start puppet server"
       end
-
       container
     end
 
@@ -125,7 +127,6 @@ CMD bash -c "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"
 
     def create_ca
       release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
-        #'(puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1 || puppet cert --allow-dns-alt-names sign `hostname`)'
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'

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],
@@ -81,12 +86,11 @@ module Pero
       else
           raise "sorry unsupport os, please pull request!!!"
       end
-      os.install(@options["agent-version"]) unless @options["agent-version"].empty?
+      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
@@ -97,6 +101,8 @@ module Pero
           if @options["one-shot"]
             Pero.log.info "stop puppet master container"
             container.kill
+          else
+            Pero.log.info "puppet master container keep running"
           end
         end
     end
@@ -111,8 +117,6 @@ module Pero
         port = container.info["Ports"].first["PublicPort"]
         begin
           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 = "mkdir -p /tmp/puppet/#{tmpdir} && unshare -m -- /bin/bash -c 'export PATH=$PATH:/opt/puppetlabs/bin/ && \
@@ -158,6 +162,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.3"
+  VERSION = "0.1.8"
 end

metadata

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