pero 0.4.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aceef1110ee7ca0f327637032d8c85072f81404b3ec82689f3acbf58653bec7c
-  data.tar.gz: c403a7d48a21536cbb38b48e88b683ccc6762c589ac16a29a92482b59657b89e
+  metadata.gz: c887b6e9b5f504590d3a89b77630d76fa1bc39823e25b74e0bece76ff74a94b7
+  data.tar.gz: 1147b48bbaf1cdc375ce946c312f14010fc75ba89c4fd610d3c1f6c4a001cfcb
 SHA512:
-  metadata.gz: 5e6bdbf09b67c5ebc60ec3098fc7e5df48fe31b9f8af7b6b5110fadb74d3e8ca8dd639496ce9a58d5a386e7758def6d921d5f3a6fd41d1da7239bda284e6c920
-  data.tar.gz: 51d394f061d6e4c04b3ad4a58ae70e9ec958e03a3f60739f12a83c7884da315c7c8245b76f5e75be38c242a3076154e7290b12765c4edf51bbfbab27cc48cae7
+  metadata.gz: 0acb6080d4ecfb1499f12628667ad952346bf4a16d97d777b9492bfcf798a86d03ba7d95788a8c84be47c811cf4880de4d03e6d7dedcec298b494fb83a53ed20
+  data.tar.gz: 25ffa99fc93c113cff3e29daa77c369daee6972c4ed1752bd6fa55ea14cf723beca64cbaea9a7b032da5100c7b2aa9d7a04536fbbf45e6ef4031d86efe05a168

data/lib/pero/cli.rb

@@ -55,24 +55,31 @@ module Pero
         return
       end
 
+      prepare
+      nodes = Pero::History.search(name_regexp)
+      return unless nodes
+      m = Mutex.new
+
       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)
-          opt["environment"] = "production" if opt["environment"].nil? || opt["environment"].empty?
-          if options["image-name"]
-            opt.delete("server-version")
-          else
-            opt.delete("image-name")
-          end
-          puppet = Pero::Puppet.new(opt["host"], opt)
+        Parallel.each(nodes, in_threads: options["concurrent"]) do |n|
+          opt = merge_options(n, options)
+          puppet = Pero::Puppet.new(opt["host"], opt, m)
           puppet.apply
         end
       rescue => e
         Pero.log.error e.backtrace.join("\n")
         Pero.log.error e.inspect
+
+      ensure
+        if options["one-shot"]
+          Pero.log.info "stop puppet master container"
+          Parallel.each(nodes, in_threads: options["concurrent"]) do |n|
+            opt = merge_options(n, options)
+            Pero::Puppet.new(opt["host"], opt, m).stop_master
+          end
+        else
+          Pero.log.info "puppet master container keep running"
+        end
       end
     end
 
@@ -83,9 +90,10 @@ module Pero
     def bootstrap(*hosts)
       begin
         options["environment"] = "production" if options["environment"].nil? || options["environment"].empty?
-        Parallel.each(hosts, in_process: options["concurrent"]) do |host|
+        m = Mutex.new
+        Parallel.each(hosts, in_threads: options["concurrent"]) do |host|
           raise "unknown option #{host}" if host =~ /^-/
-          puppet = Pero::Puppet.new(host, options)
+          puppet = Pero::Puppet.new(host, options, m)
 
           Pero.log.info "bootstrap pero #{host}"
           puppet.install
@@ -97,6 +105,17 @@ module Pero
     end
 
     no_commands do
+      def merge_options(node, options)
+        opt = node["last_options"].merge(options)
+        opt["environment"] = "production" if opt["environment"].nil? || opt["environment"].empty?
+        if options["image-name"]
+          opt.delete("server-version")
+        else
+          opt.delete("image-name")
+        end
+        opt
+      end
+
       def prepare
         `bundle install` if File.exists?("Gemfile")
         `bundle exec librarian-puppet install` if File.exists?("Puppetfile")

data/lib/pero/docker.rb

@@ -14,6 +14,7 @@ module Pero
 
     def build
       Pero.log.info "start build container"
+      ::Docker.options[:read_timeout] = 300
       begin
         image = if image_name
                   ::Docker::Image.create('fromImage' => image_name)
@@ -41,7 +42,7 @@ module Pero
 
     def alerady_run?
       c = find
-      c && c.info["State"] == "running" && c.exec(['pkill', '-HUP', '-f', 'puppet-server']) && c
+      c && c.info["State"] == "running" && c
     end
 
     def run
@@ -138,8 +139,19 @@ EOS
         ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver"]
       end
 
+      vault_repo = if el == 6
+        <<-EOS
+RUN sed -i "s|#baseurl=|baseurl=|g" /etc/yum.repos.d/CentOS-Base.repo \
+  && sed -i "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-Base.repo \
+  && sed -i "s|http://mirror\.centos\.org/|http://vault\.centos\.org/|g" /etc/yum.repos.d/CentOS-Base.repo
+        EOS
+      else
+        ''
+      end
+
       <<-EOS
 FROM #{from_image}
+#{vault_repo}
 RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package}  && \
 rpm -ivh #{release_package}
 RUN yum install -y #{package_name}-#{server_version}

data/lib/pero/history.rb

@@ -28,6 +28,7 @@ module Pero
                end
         options.delete("noop")
         options.delete("tags")
+        options.delete("user")
         @h = {
           name: name,
           last_options: options

data/lib/pero/puppet.rb

@@ -23,8 +23,9 @@ module Pero
   class Puppet
     extend Pero::SshExecutable
     attr_reader :specinfra
-    def initialize(host, options)
+    def initialize(host, options, mutex)
       @options = options.dup
+      @mutex = mutex
 
       @options[:host] = host
       so = ssh_options
@@ -90,6 +91,10 @@ module Pero
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
+    def stop_master
+      run_container.kill if docker.alerady_run?
+    end
+
     def serve_master
         container = run_container
         begin
@@ -97,19 +102,20 @@ module Pero
         rescue => e
           Pero.log.error e.inspect
           raise e
-        ensure
-          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
 
+    def docker
+      Pero::Docker.new(@options["server-version"], @options["image-name"], @options["environment"], @options["volumes"])
+    end
+
     def run_container
-      docker = Pero::Docker.new(@options["server-version"], @options["image-name"], @options["environment"], @options["volumes"])
-      docker.alerady_run? || docker.run
+      begin
+        @mutex.lock
+        docker.alerady_run? || docker.run
+      ensure
+        @mutex.unlock
+      end
     end
 
     def apply
@@ -172,6 +178,7 @@ module Pero
         ret << " --#{n}" if options[n]
       end
       ret << " --tags #{options["tags"].join(",")}" if options["tags"]
+      ret << " --environment #{options["environment"]}" if options["environment"]
       ret
     end
 

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.4.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.