pero 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 103d891b1713c5264fa52107389bedf8b5b8aa3a2ff4139a438a0cd335ce3376
-  data.tar.gz: fcbb6995fec0b668f77f4b590ba3e91fd1dba55df920f620d85660a43e7f58d8
+  metadata.gz: 1fa8e3c0220e5ddfff94bb9944e6f3aa07f409c3579811943524da1de45783bd
+  data.tar.gz: 8ebbe115e81746cfd98b4d4293a8df4301dd598c5c3977a0d2de9129bd4cdd3d
 SHA512:
-  metadata.gz: 72b02283c6e5963f9d7944b476b9ec7b0004cb9bda9db7a90da1fea72761ba65099165d886ec3d7751bb97097154e8f078107892e27585a9436a5c7e2ae4434b
-  data.tar.gz: 5f44729bd0d480a61a6eae0bf050b8157d0231c1f3fce33a31cab47ae63e6c11451c2fbd22a9f3fbc605c8cb4522543a1c20f9adb0cea579c3332de32eccd888
+  metadata.gz: 45b84acb77370f21318ca8eefb9d8d84279f16b13229181d36fb2119f0247ad84c11205e8a591898ec41771f12e93173a8026c2210c8b5370adf35c312a93b32
+  data.tar.gz: '079d3f94c94d18fd9b17bf0809704ac1eff8992bc17c1de72c5eac1304a6a60d3b4a2cbe9780b0bbb55bae55e7f502dc9d134e909362c1a78e7ca38737b30d95'

data/lib/pero/cli.rb

@@ -55,24 +55,29 @@ module Pero
         return
       end
 
+      prepare
+      nodes = Pero::History.search(name_regexp)
+      return unless nodes
       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
+          opt = merge_options(n, options)
           puppet = Pero::Puppet.new(opt["host"], opt)
           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_process: options["concurrent"]) do |n|
+            opt = merge_options(n, options)
+            Pero::Puppet.new(opt["host"], opt).stop_master
+          end
+        else
+          Pero.log.info "puppet master container keep running"
+        end
       end
     end
 
@@ -97,6 +102,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,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

@@ -90,6 +90,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,18 +101,14 @@ 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
     end
 
@@ -172,6 +172,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.0"
+  VERSION = "0.5.1"
 end

metadata

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