pvcglue 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29094a42e1588de62c31f9259be0bc1d0f9d4c91
-  data.tar.gz: cc6c3e188893749c8082f821c751992168d1e02e
+  metadata.gz: 212d9eddb6cf1cf3c75a20d6b7aa913f1bc68d6b
+  data.tar.gz: 5d74759df153a45c751d3d5cf64e0d6f1ea414a8
 SHA512:
-  metadata.gz: 7a87fabdd8819a42e894eaa53253f76585fadeb29edf55989e9e34df16ce720caed49205a425bdda95256b122b5a3cc8624db86cee24906cc95a0eb9950ded82
-  data.tar.gz: 2add0cab736ec4a2c00aef8e29717a7f3c603f4764f39ef2a3d40353557ec26675cb0bfef8aa722083666c8916d43725b0ea7a62517da824224e7e93b6a547d8
+  metadata.gz: 6c6ce7454bf80150ac10a315314c2efdd03285a29395f1cc9c5e4523d302e26fbabc189b3519d536e754bf8e8a2b85e022dc4c98ae7191d00f28a5b8228deb0f
+  data.tar.gz: eea27fbb1d3edd84b2b4e6a566cdaa118108e82917713cc9b6c0704c734856e633fbe4d6d93d36f68475c5e4de27ee06421518f1a28dedf5babe45a57ed811c9

data/lib/pvcglue.rb

@@ -40,9 +40,17 @@ module Pvcglue
   mattr_accessor :logger do
 
     logger = Logger.new(STDOUT)
-    # logger.level = Logger::INFO # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-    logger.level = Logger::DEBUG # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-    # logger.warn('Starting up...')
+    # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+    if ARGV.detect {|arg| arg.downcase == '--debug' || arg.downcase == '--verbose'}
+      logger.level = Logger::DEBUG 
+    elsif ARGV.detect { |arg| arg.downcase == '--quiet' }
+      logger.level = Logger::WARN 
+    elsif ARGV.detect { |arg| arg.downcase == '--info' }
+      logger.level = Logger::INFO 
+    else
+      logger.level = Logger::INFO 
+    end
+
     logger.formatter = proc do |severity, datetime, progname, msg|
       minion_name = Pvcglue.logger_current_minion.try(:machine_name)
       minion_name = "/#{minion_name}" if minion_name

data/lib/pvcglue/cli.rb

@@ -6,11 +6,15 @@ module Pvcglue
 
   class CLI < Thor
     class_option :cloud_manager_override
-    class_option :verbose
-    class_option :rebuild
     class_option :save_before_upload
+    class_option :rebuild
     class_option :create_test_cert
     class_option :force_cert
+    class_option :provision_only
+    class_option :quiet
+    class_option :info
+    class_option :debug
+    class_option :verbose
 
     def initialize(args = [], local_options = {}, config = {})
       super

data/lib/pvcglue/connection.rb

@@ -182,8 +182,20 @@ module Pvcglue
       end
     end
 
+    def scp_quiet_option
+      case Pvcglue.logger.level
+        when Logger::DEBUG # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+          ''
+        when Logger::INFO
+          '-q '
+        else
+          '-q '
+      end
+    end
+
     def download_file(user, remote_file, local_file, raise_error = true)
-      cmd = %{scp #{user}@#{minion.public_ip}:#{remote_file} #{local_file}}
+
+      cmd = %{scp #{scp_quiet_option}#{user}@#{minion.public_ip}:#{remote_file} #{local_file}}
       if raise_error
         system_command!(cmd)
       else

data/lib/pvcglue/env.rb

@@ -72,6 +72,8 @@ module Pvcglue
       #   Pvcglue::Packages.apply('env-get-stage'.to_sym, :manager, Pvcglue::Manager.manager_node, 'pvcglue')
       #   write_stage_env_cache
       # end
+      # TODO:  Warn DB_USER_POSTGRES_HOST IP address does not exist in the configured machines
+
       merged = stage_env_defaults.merge(Pvcglue.cloud.stage_env)
       if merged != Pvcglue.cloud.stage_env
         Pvcglue.cloud.stage_env = merged

data/lib/pvcglue/packages/postgresql.rb

@@ -11,13 +11,13 @@ module Pvcglue
         connection.write_to_file_from_template(:root, 'postgresql.conf.erb', '/etc/postgresql/9.6/main/postgresql.conf', 'postgres', 'postgres', '0644')
         connection.write_to_file_from_template(:root, 'pg_hba.conf.erb', '/etc/postgresql/9.6/main/pg_hba.conf', 'postgres', 'postgres', '0644')
 
-        # connection.run_get_stdout(:root, '', 'service postgresql restart')
-        # unless $?.exitstatus == 0
-        #   Pvcglue.logger.error { 'Unable to (re)start postgresql.  Getting status...' }
-        #   result = connection.run_get_stdout(:root, '', 'systemctl status postgresql.service')
-        #   puts result
-        #   raise('There was a problem restarting PostgreSQL.')
-        # end
+        connection.run_get_stdout(:root, '', 'service postgresql restart')
+        unless $?.exitstatus == 0
+          Pvcglue.logger.error { 'Unable to (re)start postgresql.  Getting status...' }
+          result = connection.run_get_stdout(:root, '', 'systemctl status postgresql.service')
+          puts result
+          raise('There was a problem restarting PostgreSQL.')
+        end
 
         username = Pvcglue.cloud.stage_env['DB_USER_POSTGRES_USERNAME']
         password = Pvcglue.cloud.stage_env['DB_USER_POSTGRES_PASSWORD']

data/lib/pvcglue/stack.rb

@@ -34,16 +34,26 @@ module Pvcglue
       # ap minions['staging-pg'].private_ip
       new_minions = []
       minions.each do |minion_name, minion|
+        next unless minion.has_role?(@roles_filter)
         Pvcglue.logger_current_minion = minion
         # droplet = Pvcglue::DigitalOcean.client.droplets.find(id: 38371925)
         # minion.droplet = droplet
         # new_minions << minion if true || minion.provision!
         unless minion.provisioned?
-          if droplets.detect { |droplet| droplet.name == minion_name }
-            raise(Thor::Error, "Machine with the name of '#{minion_name}' already exists!")
+          existing_droplet = droplets.detect { |droplet| droplet.name == minion_name }
+          if existing_droplet
+            Pvcglue.logger.warn("Machine with the name of '#{minion_name}' already exists.")
+            if Thor::Shell::Basic.new.yes?("Existing machine found.  Do you want to use #{existing_droplet.id} for #{minion_name}")
+              minion.droplet = existing_droplet
+              new_minions << minion
+            else
+              Pvcglue.logger.error("Machine with the name of '#{minion_name}' already exists.")
+              raise("Machine with the name of '#{minion_name}' already exists.")
+            end
+          else
+            minion.provision!
+            new_minions << minion
           end
-          minion.provision!
-          new_minions << minion
         end
       end
       Pvcglue.logger_current_minion = nil
@@ -73,23 +83,17 @@ module Pvcglue
         # Pvcglue.cloud.reload_minions!
       end
 
-      minions.each do |minion_name, minion|
-        next unless minion.has_role?(@roles_filter)
-        Pvcglue.logger_current_minion = minion
-        minion.build!
-      end
-      Pvcglue.logger_current_minion = nil
-
-      # raise(Thor::Error, 'STOP!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-      #
-      # %w(lb db web caching redis).each do |role|
-      #   if apply_role?(role)
-      #     Pvcglue::Packages.apply(role.to_sym, :build, Pvcglue.cloud.minions_filtered(role))
-      #   end
-      # end
+      unless Pvcglue.command_line_options[:provision_only]
+        minions.each do |minion_name, minion|
+          next unless minion.has_role?(@roles_filter)
+          Pvcglue.logger_current_minion = minion
+          minion.build!
+        end
 
-      Pvcglue::Pvcify.run unless minions.values.first.minion_manager?
+        Pvcglue.logger_current_minion = nil
 
+        Pvcglue::Pvcify.run unless minions.values.first.minion_manager?
+      end
     end
 
     def write_config(minions)
@@ -119,10 +123,10 @@ module Pvcglue
 
     def update_minion_data(minion, ip_addresses, cloud_id, data)
       unless minion.public_ip_address.nil? && minion.private_id_address.nil? && minion.cloud_id.nil?
-        raise(Thor::Error, "#{minion.machine_name} has previously defined ip address(es) or cloud_id, can not change.")
+        raise("#{minion.machine_name} has previously defined ip address(es) or cloud_id, can not change.")
       end
       if ip_addresses.public.nil? || ip_addresses.private.nil? || cloud_id.nil?
-        raise(Thor::Error, "New IP addresses (#{ip_addresses}) or cloud_id (#{cloud_id}) are not valid.")
+        raise("New IP addresses (#{ip_addresses}) or cloud_id (#{cloud_id}) are not valid.")
       end
 
 

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - T. Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler