pero 0.4.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e71ae384d9b40a6c02b73412d3d8f56cd35ebc08726f001aedad918368919281
-  data.tar.gz: 7913b4e622a3f11d9b0a63e599090062c0bb934999efa56d67a929246d4f6e70
+  metadata.gz: e8fc62fc16984c838f034444f6dc537009aaa019e460a5998bad1184411c8a5b
+  data.tar.gz: 02233a95f14a8a58e622cfc1cb23cdc55edb81b2ede70bd015872ad642788189
 SHA512:
-  metadata.gz: 77e59a21bd793e8f6df35b5a34043ff7a874974e9093265e6b4bf465c93393427cfc1f566fa2531fb3d099193cf442c94944a0fad6dfcf6c9757b8df0ab4518c
-  data.tar.gz: 2c09b35e3d0254018e7b84318aed6e3db2c609f0ca0b2bae05819d8fb6ef35a29cdd8bcb0187facec6cc00df5de7d516f61d4757c9875b6aed5e5802aa3982f0
+  metadata.gz: 88141e0b5932f838695df5fca5a558a1b9523a8486201d643bf866cbf019771f011d8dede89d363518fe70873b4d5fa86dd1746ba6bc16e2a3cafe6f4af729af
+  data.tar.gz: cc8ad0c0c15759f70a318121dcc4cf567138c35e1321e460820563112c132c65efcc1d853bfa69ba2612617436c13e8a338851dd0a29b49eb946ba6da09de1e9

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)
@@ -138,8 +139,26 @@ 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
+
+      legacy_signing = if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
+        "RUN echo 'LegacySigningMDs md5' >> /etc/pki/tls/legacy-settings"
+      else
+        ''
+      end
+
       <<-EOS
 FROM #{from_image}
+#{vault_repo}
+#{legacy_signing}
 RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package}  && \
 rpm -ivh #{release_package}
 RUN yum install -y #{package_name}-#{server_version}
@@ -149,7 +168,7 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def create_ca
-      release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
         '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'
@@ -159,7 +178,12 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def run_cmd
-      release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
+        # /var/puppet/run is created for the first time by running `puppet master`,
+        # but `puppet master` will fail because the permissions are wrong.
+        # So, let the `puppet master` fail once, fix the permission of /var/puppet/run, and execute `puppet master` again.
+        'puppet master --no-daemonize --verbose || (chown puppet: /var/puppet/run && puppet master --no-daemonize --verbose)'
+      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
         'puppet master --no-daemonize --verbose'
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
         'puppetserver foreground'

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.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.3
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-04-16 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.