pero 0.1.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f970d0b7869fb40c3e86c2946655bd523971901322cf0e290647c2dbe0115a1b
-  data.tar.gz: f2a7c166a9feff206398f8e7dad567c24860cd7613f06a1f2a81f3ff6c9f55ac
+  metadata.gz: 17794a1ffa026b662d06b36840a883a434823c791db1839ef1efba8306238a63
+  data.tar.gz: af2d15aa1377be5af99b1769c6690adeddba106b51e62eaf20e778566df6a96b
 SHA512:
-  metadata.gz: 28ca76f64521f7529d63cb1c7bfd0ab2747ade30d3f0cbe247f6793a45e6c147e677086e896d925bd1fc2401d74bb1265bdd63c88dcd5c801d2c03496834fba0
-  data.tar.gz: fc59ba398210e11a801cafa509eb81c8db0dcb6e3837b78562a021f0face8741935ecff2b2d5cac021bd5940612524a3ff5a6d18197022bfb2e181a27aba098f
+  metadata.gz: 372e94f0f02059e076ebbbf7976ecc188b9f22a983c6fe0cd788e899f3536c0c99a1728d33df080458b7e21bd7207f5df9d547a373837d19da25da6544d43388
+  data.tar.gz: 7a4baefe02de81bc4551777fcc785ad1332bf2ee7ede50fd5c1d682dfcb1f5479a32221ccec31c9bae6085964da96d93dafac11c5fce716cd509b4115f4641e1

data/.gitignore

@@ -6,3 +6,4 @@ run
 yaml
 log
 pkg
+Gemfile.lock

data/Rakefile

@@ -4,3 +4,8 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :build_docker do
+  puts `docker build -f ./misc/Dockerfile -t pyama/puppet:3.0.1 .`
+  puts `docker push pyama/puppet:3.0.1`
+end

data/lib/pero/cli.rb

@@ -20,6 +20,7 @@ module Pero
       option :user, type: :string, aliases: ['-x'], desc: "ssh user"
       option :key, type: :string, aliases: ['-i'], desc: "ssh private key"
       option :port, type: :numeric, aliases: ['-p'], desc: "ssh port"
+      option "timeout", default: 10, type: :numeric, desc: "ssh connect timeout"
       option :ssh_config, type: :string, desc: "ssh config path"
       option :environment, type: :string, desc: "puppet environment"
       option :ask_password, type: :boolean, default: false, desc: "ask ssh or sudo password"
@@ -30,23 +31,47 @@ 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"
     shared_options
-    option "server-version", type: :string, default: "6.12.0"
+    option "server-version", type: :string
+    option "image-name", type: :string
     option :noop, aliases: '-n', default: false, type: :boolean
+    option :test, aliases: '-t', default: false, type: :boolean
     option :verbose, aliases: '-v', default: true, type: :boolean
     option :tags, default: nil, type: :array
+    option :volumes, 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
+
+      if !options["image-name"] && !options["server-version"]
+        Pero.log.error "image-name or server-version are required"
+        return
+      end
+
+      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
+          puppet = Pero::Puppet.new(opt["host"], opt)
+          puppet.apply
+        end
+      rescue => e
+        Pero.log.error e.inspect
       end
     end
 
@@ -55,10 +80,24 @@ 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
+        options["environment"] = "production" if options["environment"].empty?
+        Parallel.each(hosts, in_process: options["concurrent"]) do |host|
+          raise "unknown option #{host}" if host =~ /^-/
+          puppet = Pero::Puppet.new(host, options)
+
+          Pero.log.info "bootstrap pero #{host}"
+          puppet.install
+        end
+      rescue => e
+        Pero.log.error e.inspect
+      end
+    end
+
+    no_commands do
+      def prepare
+        `bundle install` if File.exists?("Gemfile")
+        `bundle exec librarian-puppet install` if File.exists?("Puppetfile")
       end
     end
   end

data/lib/pero/docker.rb

@@ -4,16 +4,22 @@ require "retryable"
 require 'net/https'
 module Pero
   class Docker
-    attr_reader :server_version
-    def initialize(version, environment)
+    attr_reader :server_version, :image_name, :volumes
+    def initialize(version, image_name, environment, volumes)
       @server_version = version
+      @image_name = image_name
       @environment = environment
+      @volumes = volumes
     end
 
     def build
       Pero.log.info "start build container"
       begin
-        image = ::Docker::Image.build(docker_file)
+        image = if image_name
+                  ::Docker::Image.create('fromImage' => image_name)
+                else
+                  ::Docker::Image.build(docker_file)
+                end
       rescue => e
         Pero.log.debug docker_file
         Pero.log.error "failed build container #{e.inspect}"
@@ -24,64 +30,70 @@ module Pero
     end
 
     def container_name
-      "pero-#{server_version}-#{Digest::MD5.hexdigest(Dir.pwd)[0..5]}-#{@environment}"
+      "pero-#{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"] == "running" && c
+    end
+
     def run
       ::Docker::Container.all(:all => true).each do |c|
         c.delete(:force => true) if c.info["Names"].first == "/#{container_name}"
       end
 
+      vols = volumes || []
+      vols << "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}"
+      vols << "#{Dir.pwd}/keys:/etc/puppetlabs/puppet/eyaml/"
+
       container = ::Docker::Container.create({
         'name' => container_name,
         'Hostname' => 'puppet',
         'Image' => build.id,
         'ExposedPorts' => { '8140/tcp' => {} },
+        'HostConfig' => {
+          'Binds' => vols,
+          'PortBindings' => {
+            '8140/tcp' => [{ 'HostPort' => "0" }],
+          },
+        },
+        'Cmd' => ["bash", "-c", "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"]
       })
 
       Pero.log.info "start puppet master container"
-      container.start(
-        'Binds' => [
-          "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}",
-          "#{Dir.pwd}/keys:/etc/puppetlabs/puppet/eyaml/",
-        ],
-        'PortBindings' => {
-          '8140/tcp' => [{ 'HostPort' => "0" }],
-        },
-        "AutoRemove" => true,
-      )
-
-      container = ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}"
-      end
+      container.start
 
+      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"])
-          https.use_ssl = true
-          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          Pero.log.debug "start server health check"
-          https.start {
-            response = https.get('/')
-            Pero.log.debug "puppet http response #{response}"
-          }
-        rescue => e
-          Pero.log.debug e.inspect
-          raise e
+          begin
+            https = Net::HTTP.new('localhost', container.info["Ports"].first["PublicPort"])
+            https.use_ssl = true
+            https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            Pero.log.debug "start server health check"
+            https.start {
+              response = https.get('/')
+              Pero.log.debug "puppet http response #{response}"
+            }
+          rescue => e
+            Pero.log.debug e.inspect
+            raise e
+          end
         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
 
@@ -102,15 +114,28 @@ EOS
 
 
     end
+
+    def conf_dir
+      if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
+        "/etc/puppet"
+      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
+        "/etc/puppetlabs/puppet/"
+      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
+        "/etc/puppetlabs/puppet/"
+      else
+        "/etc/puppetlabs/puppet/"
+      end
+    end
+
     def docker_file
-      release_package,package_name, conf_dir  = if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
-        ["puppetlabs-release-el-#{el}.noarch.rpm", "puppet-server", "/etc/puppet"]
+      release_package,package_name = if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
+        ["puppetlabs-release-el-#{el}.noarch.rpm", "puppet-server"]
       elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
-        ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", "puppetserver", "/etc/puppetlabs/puppet/"]
+        ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", "puppetserver"]
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
-        ["puppet5-release-el-#{el}.noarch.rpm", "puppetserver", "/etc/puppetlabs/puppet/"]
+        ["puppet5-release-el-#{el}.noarch.rpm", "puppetserver"]
       else
-        ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver", "/etc/puppetlabs/puppet/"]
+        ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver"]
       end
 
       <<-EOS
@@ -120,13 +145,11 @@ rpm -ivh #{release_package}
 RUN yum install -y #{package_name}-#{server_version}
 ENV PATH $PATH:/opt/puppetlabs/bin
 RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
-CMD bash -c "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"
       EOS
     end
 
     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/history.rb

@@ -27,6 +27,7 @@ module Pero
                  options["node-name"]
                end
         options.delete("noop")
+        options.delete("tags")
         @h = {
           name: name,
           last_options: options

data/lib/pero/puppet.rb

@@ -53,6 +53,7 @@ module Pero
       opts[:password] = @options["password"] if @options["password"]
       opts[:keys] = [@options["key"]] if @options["key"]
       opts[:port] = @options["port"] if @options["port"]
+      opts[:timeout] = @options["timeout"] if @options["timeout"]
 
       if @options["vagrant"]
         config = Tempfile.new('', Dir.tmpdir)
@@ -78,7 +79,6 @@ module Pero
     end
 
     def install
-      Pero.log.info "bootstrap pero"
       osi = specinfra.os_info
       os = case osi[:family]
       when "redhat"
@@ -101,12 +101,14 @@ 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
 
     def run_container
-      docker = Pero::Docker.new(@options["server-version"], @options["environment"])
+      docker = Pero::Docker.new(@options["server-version"], @options["image-name"], @options["environment"], @options["volumes"])
       docker.alerady_run? || docker.run
     end
 
@@ -121,11 +123,13 @@ module Pero
                            mkdir -p `puppet config print ssldir` && mount --bind /tmp/puppet/#{tmpdir} `puppet config print ssldir` && \
                            #{puppet_cmd}'"
             Pero.log.debug "run cmd:#{cmd}"
-            ssh.exec!(specinfra.build_command(cmd))  do |channel, stream, data|
-                             Pero.log.info "#{host}:#{data.chomp}" if stream == :stdout && data.chomp != ""
-                             Pero.log.warn "#{host}:#{data.chomp}" if stream == :stderr && data.chomp != ""
-                           end
-            ssh.exec!(specinfra.build_command("rm -rf /tmp/puppet/#{tmpdir}")) if @options["one-shot"]
+            ssh_exec(ssh, host, cmd)
+
+            if @options["one-shot"]
+              cmd = "/bin/rm -rf /tmp/puppet/#{tmpdir}"
+              ssh_exec(ssh, host, cmd)
+            end
+
             ssh.loop {true} if ENV['PERO_DEBUG']
           end
         rescue => e
@@ -136,17 +140,35 @@ module Pero
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
+    def ssh_exec(ssh, host, cmd)
+      ssh.open_channel do |ch|
+        ch.request_pty
+        ch.on_data do |ch,data|
+          Pero.log.info "#{host}:#{data.chomp}"
+        end
+
+        ch.on_extended_data do |c,type,data|
+          Pero.log.error "#{host}:#{data.chomp}"
+        end
+
+        ch.exec specinfra.build_command(cmd) do |ch, success|
+          raise "could not execute #{cmd}" unless success
+        end
+      end
+      ssh.loop
+    end
+
     def puppet_cmd
         if Gem::Version.new("5.0.0") > Gem::Version.new(@options["agent-version"])
-            "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --server localhost"
+            "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_port 8140 --ca_server localhost --masterport 8140 --server localhost"
         else
-            "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --server localhost"
+            "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_server localhost --masterport 8140 --server localhost"
         end
     end
 
     def parse_puppet_option(options)
       ret = ""
-      %w(noop verbose).each do |n|
+      %w(noop verbose test).each do |n|
         ret << " --#{n}" if options[n]
       end
       ret << " --tags #{options["tags"].join(",")}" if options["tags"]

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.1.6"
+  VERSION = "0.3.0"
 end

data/misc/Dockerfile

@@ -0,0 +1,11 @@
+FROM centos:6
+RUN yum -y install curl epel-release
+RUN rpm -ivh https://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-12.noarch.rpm
+RUN curl -O http://software.exogeni.net/repo/puppet/6/products/x86_64/puppet-server-3.0.1-1.el6.noarch.rpm && \
+curl -O http://software.exogeni.net/repo/puppet/6/products/x86_64/puppet-3.0.1-1.el6.noarch.rpm && \
+yum -y install puppet-3.0.1-1.el6.noarch.rpm puppet-server-3.0.1-1.el6.noarch.rpm
+RUN mkdir -p /etc/puppetlabs/code/environments/production
+
+RUN echo -e "[master]\nvardir= /var/puppet\nmanifestdir = /var/puppet/data/manifests\n templatedir = /var/puppet/data/templates\n modulepath  = /var/puppet/data/modules:/var/puppet/data/roles:/var/puppet/data/vendor/modules\nlogdir = /var/log/puppet\n rundir = /var/run/puppet\n ssldir = /var/puppet/ssl\n" > /etc/puppet/puppet.conf
+
+CMD bash -c "rm -rf /etc/puppet/ssl/* && puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1 && echo '*' > /etc/puppet/autosign.conf && puppet master --no-daemonize --verbose"

data/pero.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'retryable'
   spec.add_dependency 'specinfra'
   spec.add_dependency 'parallel'
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,30 +112,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -179,6 +178,7 @@ files:
 - lib/pero/puppet/redhat.rb
 - lib/pero/ssh_executable.rb
 - lib/pero/version.rb
+- misc/Dockerfile
 - pero.gemspec
 homepage: https://github.com/pyama86/pero
 licenses:
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pero (0.1.5)
-      docker-api
-      logger
-      net-ssh
-      parallel
-      retryable
-      specinfra
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    docker-api (1.34.2)
-      excon (>= 0.47.0)
-      multi_json
-    excon (0.76.0)
-    logger (1.4.2)
-    multi_json (1.15.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
-    net-telnet (0.1.1)
-    parallel (1.19.2)
-    rake (10.5.0)
-    retryable (3.0.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sfl (2.3)
-    specinfra (2.82.19)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  pero!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.3