pvcglue 0.9.3 → 0.9.4

data/lib/pvcglue/pvcify.rb

@@ -1,7 +1,7 @@
 module Pvcglue
   class Pvcify
     def self.run
-      Pvcglue::Monit.monitify
+      # Pvcglue::Monit.monitify
       Pvcglue::Capistrano.capify
       Pvcglue::Db.configure_database_yml
     end

data/lib/pvcglue/stack.rb

@@ -40,11 +40,11 @@ module Pvcglue
         # minion.droplet = droplet
         # new_minions << minion if true || minion.provision!
         unless minion.provisioned?
-          existing_droplet = droplets.detect { |droplet| droplet.name == minion_name }
-          if existing_droplet
+          existing_machine = minion.pvc_cloud_provider.find_by_name(minion_name)
+          if existing_machine
             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
+            if Thor::Shell::Basic.new.yes?("Existing machine found.  Do you want to use #{existing_machine.id} for #{minion_name}")
+              minion.machine = existing_machine
               new_minions << minion
             else
               Pvcglue.logger.error("Machine with the name of '#{minion_name}' already exists.")
@@ -60,14 +60,14 @@ module Pvcglue
 
       if new_minions.size > 0
         # ap new_minions
-        Pvcglue.logger.info("Checking status of new minions (#{new_minions.size})...")
+        Pvcglue.logger.info("Checking the status of the #{new_minions.size == 1 ? 'new minion' : "#{new_minions.size} minions"}...")
         time = Benchmark.realtime do
           begin
-            lazy_minions = get_lazy_minions(minions)
+            lazy_minions = get_lazy_minions(new_minions)
             unless lazy_minions.size == 0
               # puts '*'*175
               # ap waiting_for
-              Pvcglue.logger.info("Waiting for #{lazy_minions.map { |key, value| key }.join(', ')}...")
+              Pvcglue.logger.info("Waiting for #{lazy_minions.map { |minion| minion.machine_name }.join(', ')}...")
               sleep(1.5)
             end
           end until lazy_minions.size == 0
@@ -77,6 +77,7 @@ module Pvcglue
             minions[updated_minion.machine_name].public_ip = updated_minion.public_ip
             minions[updated_minion.machine_name].cloud_id = updated_minion.cloud_id
             minions[updated_minion.machine_name].connection = Pvcglue::Connection.new(minions[updated_minion.machine_name])
+            Pvcglue::Packages::SshKeyCheck.apply(minions[updated_minion.machine_name])
           end
         end
         Pvcglue.logger.info("Minions (finally) ready after #{time.round(2)} seconds!")
@@ -101,19 +102,27 @@ module Pvcglue
       Pvcglue::Manager.pull_configuration
       data = File.read(Pvcglue.cloud.local_file_name)
       updated_minions = minions.map do |minion|
-        # puts '-'*175
-        # ap minion.droplet
-        # Refresh droplet (didn't find a reload method)
-        droplet_id = minion.droplet.id.to_s
-        # ap droplet_id
-        minion.droplet = Pvcglue::DigitalOcean.client.droplets.find(id: droplet_id)
-        # puts '='*175
-        # ap minion.droplet
-        ip_addresses = Pvcglue::DigitalOcean.get_ip_addresses(minion.droplet)
-        data = update_minion_data(minion, ip_addresses, droplet_id, data)
-        minion.public_ip = ip_addresses.public
-        minion.private_ip = ip_addresses.private
-        minion.cloud_id = droplet_id
+        # # puts '-'*175
+        # # ap minion.droplet
+        # # Refresh droplet (didn't find a reload method)
+        # droplet_id = minion.droplet.id.to_s
+        # # ap droplet_id
+        # minion.droplet = Pvcglue::CloudProvider.client.droplets.find(id: droplet_id)
+        # # puts '='*175
+        # # ap minion.droplet
+        # ip_addresses = Pvcglue::CloudProvider.get_ip_addresses(minion.droplet)
+        # data = update_minion_data(minion, ip_addresses, droplet_id, data)
+        # minion.public_ip = ip_addresses.public
+        # minion.private_ip = ip_addresses.private
+        # minion.cloud_id = droplet_id
+        # minion
+
+        minion.machine = minion.pvc_cloud_provider.reload_machine_data(minion)
+        data = update_minion_data(minion, data)
+        minion.public_ip = minion.machine.public_ip
+        minion.private_ip = minion.machine.private_ip
+        minion.cloud_id = minion.machine.id
+
         minion
       end
       File.write(Pvcglue.cloud.local_file_name, data)
@@ -121,16 +130,17 @@ module Pvcglue
       updated_minions
     end
 
-    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("#{minion.machine_name} has previously defined ip address(es) or cloud_id, can not change.")
+    # def update_minion_data(minion, ip_addresses, cloud_id, data)
+    def update_minion_data(minion, data)
+      unless minion.public_ip.nil? && minion.private_ip.nil? && minion.cloud_id.nil?
+        raise("#{minion.machine_name} has previously defined ip address(es) or id, can not change.  As a safety measure, you will need to manually remove any old data")
       end
-      if ip_addresses.public.nil? || ip_addresses.private.nil? || cloud_id.nil?
-        raise("New IP addresses (#{ip_addresses}) or cloud_id (#{cloud_id}) are not valid.")
+      if minion.machine.public_ip.nil? || minion.machine.private_ip.nil? || minion.machine.id.nil?
+        raise("New public IP address (#{minion.machine.public_ip}) or private IP address (#{minion.machine.private_ip}) or cloud_id (#{minion.machine.id}) are not valid.")
       end
 
 
-      replacement = "\\1\\2\n\\1public_ip = '#{ip_addresses.public}'\n\\1private_ip = '#{ip_addresses.private}'\n\\1cloud_id = '#{cloud_id}'"
+      replacement = "\\1\\2\n\\1public_ip = '#{minion.machine.public_ip}'\n\\1private_ip = '#{minion.machine.private_ip}'\n\\1cloud_id = '#{minion.machine.id}'"
       new_data = data.sub(/( *)(name\s*=\s*['"]#{Regexp.quote(minion.machine_name)}['"])/, replacement)
       raise "Unable to update minion data for #{minion.machine_name}." if data == new_data
 
@@ -145,25 +155,11 @@ module Pvcglue
       new_data
     end
 
-    def droplets
-      @droplets ||= Pvcglue::DigitalOcean.client.droplets.all
-    end
-
     def get_lazy_minions(minions)
-      droplets = Pvcglue::DigitalOcean.client.droplets.all
-
-      minions.select do |minion_name, minion|
+      minions.select do |minion|
         Pvcglue.logger_current_minion = minion
-        # next unless minion.machine_name == 'staging-lb'
-        # ap minion_name
-        found = droplets.detect do |droplet|
-          droplet[:name] == minion.machine_name
-        end
-        # ap found
-        # ap found[:status]
-        !found || found[:status] != 'active'
+        !minion.pvc_cloud_provider.ready?(minion)
       end
-      # ap minions
     end
 
   end

data/lib/pvcglue/templates/pvc_manager.toml.erb

@@ -0,0 +1,182 @@
+################################################################################
+#  === Pvcglue Manager configuration file ===
+################################################################################
+
+
+# ----------------- USERS ------------------------------------------------------
+[[users]]
+  name = 'Bob'
+  github_user_name = "bob" # Get public keys from https://github.com/bob.keys
+
+[[users]]
+  name = 'Rob'
+  [users.public_keys]
+    key_1 = "ssh-rsa Example 1..."
+    key_2 = "ssh-rsa Example 2..."
+
+
+# ----------------- GROUPS -----------------------------------------------------
+[groups]
+  manager_root_users = ['Bob', 'Rob']
+  manager_users = ["==manager_root_users=="]
+
+  lead_developers = ['Bob', 'Rob']
+  developers = ['==lead_developers==']
+  all_developers = ["==lead_developers==", "==developers=="]
+
+
+# ----------------- PROJECTS ---------------------------------------------------
+[[projects]]
+  name = "project_name"
+  user_name_base = "project_name"
+  repo_url = "git@github.com:bob/project_name.git"
+  excluded_db_tables = ["versions"]
+
+  [projects.gems]
+#    delayed_job = true
+#    resque = true
+#    whenever = true
+
+#  swapfile_size = 128
+  time_zone = "UTC" # TODO:  This needs to be at the machine level
+
+  [[projects.stages]]
+    name = 'alpha'
+    db_rebuild = true
+    domains = ["sub.example.com"]
+    ssl = "none"
+
+    [[projects.stages.stack]]
+      role = 'lb'
+      machine_name = '==staging-lb=='
+
+    [[projects.stages.stack]]
+      role = 'web'
+      role_index = 1
+      machine_name = '==staging-web-1=='
+
+    [[projects.stages.stack]]
+      role = 'web'
+      role_index = 2
+      machine_name = '==staging-web-2=='
+
+    [[projects.stages.stack]]
+      role = 'worker'
+      role_index = 1
+      machine_name = '==staging-worker-1=='
+      resque_workers = 2
+      delayed_job_workers = 2
+
+    [[projects.stages.stack]]
+      role = 'worker'
+      role_index = 2
+      machine_name = '==staging-web-2=='
+      resque_workers = 2
+      delayed_job_workers = 2
+
+    [[projects.stages.stack]]
+      role = 'mc'
+      machine_name = '==staging-mc=='
+
+    [[projects.stages.stack]]
+      role = 'pg'
+      machine_name = '==staging-pg=='
+
+  [[projects.stages]]
+    name = 'beta'
+    db_rebuild = true
+    domains = ["beta.example.com"]
+    ssl = "acme" # DNS must be set up first!
+
+    [[projects.stages.stack]]
+      role = 'lb'
+      machine_name = '==staging-lb=='
+
+    [[projects.stages.stack]]
+      role = 'web'
+      role_index = 1
+      machine_name = '==staging-web-1=='
+
+    [[projects.stages.stack]]
+      role = 'pg'
+      machine_name = '==staging-pg=='
+
+
+# ----------------- MACHINES ---------------------------------------------------
+[[machines]]
+  name = 'staging-lb'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-web-1'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-web-2'
+  tags = ['development', 'web']
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-worker-1'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-pg'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-mc'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+[[machines]]
+  name = 'staging-redis'
+  root_users = "==lead_developers=="
+  users = "==all_developers=="
+
+
+# ----------------- CLOUD ------------------------------------------------------
+[cloud_provider]
+  name = 'digital-ocean'
+  image = 'ubuntu-16-04-x64'
+
+  #region = 'nyc1' # New York 1
+  #region = 'sfo1' # San Francisco 1
+  #region = 'nyc2' # New York 2
+  #region = 'ams2' # Amsterdam 2
+  #region = 'sgp1' # Singapore 1
+  #region = 'lon1' # London 1
+  #region = 'nyc3' # New York 3
+  #region = 'ams3' # Amsterdam 3
+  #region = 'fra1' # Frankfurt 1
+  #region = 'tor1' # Toronto 1
+  region = 'sfo2' # San Francisco 2
+  #region = 'blr1' # Bangalore 1
+
+  # can't use 'size' as a key
+  default_capacity = '512mb'
+  #default_capacity = '1gb'
+  #default_capacity = '2gb'
+  #default_capacity = '4gb'
+  #default_capacity = '8gb'
+  #default_capacity = '16gb'
+  #default_capacity = 'm-16gb'
+  #default_capacity = '32gb'
+  #default_capacity = 'm-32gb'
+  #default_capacity = '48gb'
+  #default_capacity = 'm-64gb'
+  #default_capacity = '64gb'
+  #default_capacity = 'm-128gb'
+  #default_capacity = 'm-224gb'
+
+  [cloud_provider.initial_users]
+    "Bob" = "d1:fe:e8:53:d4:fb:eb:f1:db:fc:ef:18:f1:cf:1e:5d"
+    "Rob" = "d1:fe:e8:53:d4:fb:eb:f1:db:fc:ef:18:f1:cf:1e:5d"
+
+
+

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/pvcglue.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.3.0', '< 2.0'
   spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'byebug'
+  # spec.add_development_dependency 'pry'
 
   spec.add_dependency 'thor', '~> 0.19', '>= 0.19.1'
   spec.add_dependency 'toml-rb', '~> 0.3', '>= 0.3.15'
-  spec.add_dependency 'orca', '= 0.4', '= 0.4.0'
+  # spec.add_dependency 'orca', '= 0.4', '= 0.4.0'
   spec.add_dependency 'capistrano', '~> 3.4.0', '>= 3.4.1'
   spec.add_dependency 'capistrano-bundler', '~> 1.1', '>= 1.1.1'
   spec.add_dependency 'capistrano-rails', '~> 1.1', '>= 1.1.1'
@@ -33,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie'
   spec.add_dependency 'droplet_kit'
   spec.add_dependency 'paint'
-  spec.add_dependency 'pry'
+  spec.add_dependency 'tilt'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - T. Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -84,26 +98,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.15
-- !ruby/object:Gem::Dependency
-  name: orca
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +255,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -293,17 +287,19 @@ files:
 - images/pvcglue.gliffy
 - images/pvcglue.png
 - lib/pvcglue.rb
-- lib/pvcglue/all_the_things.rb
 - lib/pvcglue/bootstrap.rb
 - lib/pvcglue/capistrano.rb
 - lib/pvcglue/cli.rb
 - lib/pvcglue/cloud.rb
+- lib/pvcglue/cloud_providers.rb
+- lib/pvcglue/cloud_providers/digital_ocean.rb
+- lib/pvcglue/cloud_providers/linode.rb
 - lib/pvcglue/configuration.rb
 - lib/pvcglue/connection.rb
 - lib/pvcglue/custom_hashie.rb
 - lib/pvcglue/db.rb
 - lib/pvcglue/deploy.rb
-- lib/pvcglue/digital_ocean.rb
+- lib/pvcglue/docs.rb
 - lib/pvcglue/env.rb
 - lib/pvcglue/local.rb
 - lib/pvcglue/manager.rb
@@ -379,6 +375,7 @@ files:
 - lib/pvcglue/templates/passenger.list.erb
 - lib/pvcglue/templates/pg_hba.conf.erb
 - lib/pvcglue/templates/postgresql.conf.erb
+- lib/pvcglue/templates/pvc_manager.toml.erb
 - lib/pvcglue/templates/redis.conf.erb
 - lib/pvcglue/templates/sshd_config.erb
 - lib/pvcglue/templates/stage-deploy.rb.erb