pero 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17794a1ffa026b662d06b36840a883a434823c791db1839ef1efba8306238a63
-  data.tar.gz: af2d15aa1377be5af99b1769c6690adeddba106b51e62eaf20e778566df6a96b
+  metadata.gz: 6238513daaacabe0c8bc4135177332a2ba7257e9be3f181608af6a00ab89768d
+  data.tar.gz: 90aa39e93dacd99c74cf3cfc544314cca3b997e29a37eabcdc87e7aaf8cae192
 SHA512:
-  metadata.gz: 372e94f0f02059e076ebbbf7976ecc188b9f22a983c6fe0cd788e899f3536c0c99a1728d33df080458b7e21bd7207f5df9d547a373837d19da25da6544d43388
-  data.tar.gz: 7a4baefe02de81bc4551777fcc785ad1332bf2ee7ede50fd5c1d682dfcb1f5479a32221ccec31c9bae6085964da96d93dafac11c5fce716cd509b4115f4641e1
+  metadata.gz: 64fadc47b0c14d8b6e598c57cc90e099ede671e11e200017c70dbd59571b4fd010949af9e5b89acf706f382dc7ae9f1e55084f695fe5137f06e3429711212305
+  data.tar.gz: 300cc0852f9dd71b5e46c6d370a3eb1bfb7c38b078eb86974ec80e6d406cd8518dfc03f7d79129e7abe4512013e6b18215aaf96e46536dc9aa848cd7ceb2a94f

data/lib/pero/cli.rb

@@ -55,23 +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"].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_server
+          end
+        else
+          Pero.log.info "puppet master container keep running"
+        end
       end
     end
 
@@ -81,7 +87,7 @@ module Pero
     option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
     def bootstrap(*hosts)
       begin
-        options["environment"] = "production" if options["environment"].empty?
+        options["environment"] = "production" if options["environment"].nil? || options["environment"].empty?
         Parallel.each(hosts, in_process: options["concurrent"]) do |host|
           raise "unknown option #{host}" if host =~ /^-/
           puppet = Pero::Puppet.new(host, options)
@@ -90,11 +96,23 @@ module Pero
           puppet.install
         end
       rescue => e
+        Pero.log.error e.backtrace.join("\n")
         Pero.log.error e.inspect
       end
     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

@@ -21,13 +21,14 @@ module Pero
   class History
     class Attribute
       def initialize(specinfra, options)
-        name = if options["node-name"].empty?
+        name = if options["node-name"].nil? || options["node-name"].empty?
                  specinfra.run_command("hostname").stdout.chomp
                else
                  options["node-name"]
                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.3.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-22 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.