sistero 0.7.4 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c966aa5e013e4a912ed85572ea3df024ba5b3552
-  data.tar.gz: e3a8f4a357ad77c63cb781c13b3a6700377ea798
+SHA256:
+  metadata.gz: 0a01e88ca09bc7ef259fee75231306f215ef887081821cf7102f4dc8c2555889
+  data.tar.gz: 217d5c6d807fd34d74b07145d81b9a579ed7bd7fd955250ec2ddb2d20908fd58
 SHA512:
-  metadata.gz: 85c52cd18afca7958e0a30991238cc737381f22eb6b5f6eb81c198483410ac77647788fcd06d8cae6b924c81d5fe4b4f9491b0b0a269e436c4af6b3ab539e5c3
-  data.tar.gz: cc127f77567046ba6ad2ffdd2aa904741c87b89fa96efad279401ff934d6efdbca52399f07d4d5c7b136c4a81702ae4abd64adc898891767996e62ad0b27e311
+  metadata.gz: 57deb592ced358a0f05364c0bc7b902f3b217059b1605e982fb1af3ded786590cd5d7f041e836db37eafc80759c19db2c7c44afbf741b394bc710f54e95ee0ca
+  data.tar.gz: d855e5f5af2950f48f03b74399c6af1f110f0c5232997a907752963fe7b871c313e4a2fdbd3b6b6ca8effdcf89863fda8140506dd575687371b123dab7bc43b7

data/bin/sistero

@@ -28,7 +28,7 @@ module Sistero::Command
         subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
-      op.subcommand 'rsync vm *cmd', 'rsync files to vm'
+      op.subcommand 'rsync vm *cmd', 'rsync files to/from vm'
 
       op.subcommand 'create [*vms]', 'create vm'
       op.subcommand 'create-all', 'create all vms in config'
@@ -64,7 +64,7 @@ module Sistero::Command
     when 'create'
       vms = command_cfg.vms
       vms.push nil if vms.empty?
-      vms.each &sistero.method(:create_vm)
+      vms.each &sistero.method(:create_droplet_from_vm)
     when 'create-all'
       sistero.create_all()
     when 'destroy'

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.7.4'
+  VERSION = '0.8.3'
 end

data/lib/sistero.rb

@@ -10,12 +10,12 @@ module Sistero
     end
 
     def find_droplet(name)
-      @client.droplets.all.find { |vm| vm.name == name }
+      @client.droplets.all.find { |droplet| droplet.name == name }
     end
 
     def list_vms()
-      @client.droplets.all.each do |vm|
-        puts "#{vm.name} - #{vm.networks[0][0].ip_address}"
+      @client.droplets.all.each do |droplet|
+        puts "#{droplet.name} - #{get_public_ip droplet}"
       end
     end
 
@@ -70,10 +70,10 @@ module Sistero
       ssh_options ||= vm.ssh_options
 
       droplet = find_droplet(name) || create_droplet_from_vm(name)
-      public_network = get_public_network name, droplet
-      ip = wait_for_ssh_port public_network
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
 
-      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{ip}"
+      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{public_ip}"
       unless run.empty?
         cmd += ' ' + run.join(' ')
       end
@@ -85,10 +85,10 @@ module Sistero
     def rsync(name, cmd: nil)
       vm, name = get_vm name
       droplet = find_droplet(name) || create_droplet_from_vm(name)
-      public_network = get_public_network name, droplet
-      ip = wait_for_ssh_port public_network
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
 
-      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{ip}:")
+      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{public_ip}:")
       exec cmd_str
     end
 
@@ -145,27 +145,30 @@ module Sistero
     end
 
     private
-    def get_public_network name, droplet
-      public_network = droplet.networks.v4.find { |network| network.type == 'public' }
+    def find_public_network droplet
+      droplet&.networks&.v4.find { |network| network.type == 'public' }
+    end
+
+    private
+    def get_public_ip droplet
+      public_network = find_public_network droplet
       until public_network
         puts "no public interfaces, trying again in a second"
         sleep 1
-        droplet = find_droplet(name)
-        public_network = droplet.networks.v4.find { |network| network.type == 'public' }
+        droplet = find_droplet(droplet.name)
+        public_network = find_public_network droplet
       end
-      public_network
+      public_network.ip_address
     end
 
-    def wait_for_ssh_port public_network
-      ip = public_network.ip_address
-      unless is_port_open? ip, 22
+    def wait_for_ssh_port public_ip
+      unless is_port_open? public_ip, 22
         puts "waiting for ssh port to open"
         sleep 1
-        until is_port_open? ip, 22 do
+        until is_port_open? public_ip, 22 do
           sleep 1
         end
       end
-      ip
     end
   end
 end

data/readme.md

@@ -8,33 +8,35 @@ sistero is a profile based tool to manage a digital ocean cluster.
 
 ## Configuration
 
-The configuration file lives at `.config/sistero`, an example looks like this:
+First sistero looks for a file called `sistero.yaml` in the current directory or a parent of the current directory. If it is not found the default configuration is loaded from `.config/sistero`. Here is an example:
 
 ```
 defaults:
-  vm_name: default-vm
+  name: default-vm
   ssh_keys:
     - 1234567
   ssh_options: -D1080 -A
   access_token: f788fffffffffffff8ffffffffffffffffffffff8fffffffffffffffffffffff
-  vm_size: 512mb
-  vm_region: nyc3
-  vm_image: ubuntu-14-04-x64
-profiles:
+  size: 512mb
+  region: nyc3
+  image: ubuntu-14-04-x64
+vms:
   -
-    vm_name: london-vm
-    vm_region: lon1
+    name: default-vm
   -
-    vm_name: london-bigger-vm
-    vm_region: lon1
-    vm_size: 1gb
+    name: london-vm
+    region: lon1
+  -
+    name: london-bigger-vm
+    region: lon1
+    size: 1gb
 ```
 
-Any values not specified in a profile are taken from `defaults`. If the `defaults` entry specifies a `vm_name` then it becomes the default VM for the `create`, `ssh` and `destroy` commands.
+Any values not specified in a profile are taken from `defaults`. If the `defaults` entry specifies a `name` then it becomes the default VM for the `create`, `ssh` and `destroy` commands but is not inherited by vm configuration items.
 
 The `ssh_keys` is a list of ID numbers (rather than names) of ssh keys, these can be found by running `sistero ssh-keys`.
 
-The valid options for `region`, `vm_size` and `vm_image` can be found by running `sistero regions`, `sistero sizes` and `sistero images` respectively.
+The valid options for `region`, `size` and `image` can be found by running `sistero regions`, `sistero sizes` and `sistero images` respectively.
 
 ## Running
 
@@ -47,3 +49,58 @@ Or to create a VM called `london-vm` in london:
 ```
 sistero create london-vm
 ```
+
+The command `sistero create-all` can be used to create all VMs listed in the configuration file.
+
+## More advanced configurations
+
+This config that shows how to create a CoreOS cluster:
+
+```
+defaults:
+  ssh_user: core
+  ssh_keys:
+    - 1234567
+    - 1234568
+  ssh_options: -D1080 -A
+  access_token:
+    file: ./secrets/digital-ocean.access-token
+  region: lon1
+  image: coreos-stable
+  name: vm1
+  private_networking: true
+  user_data: |
+    #cloud-config
+    coreos:
+      etcd2:
+        # y$@" :r !curl -s -w "\n" "https://discovery.etcd.io/new?size=2"
+        discovery: https://discovery.etcd.io/af66d811fc9b5b9b0989009f849cc37a
+        # use $public_ipv4 for multi-cloud/region:
+        advertise-client-urls: http://$private_ipv4:2379
+        initial-advertise-peer-urls: http://$private_ipv4:2380
+        listen-client-urls: http://0.0.0.0:2379
+        listen-peer-urls: http://$private_ipv4:2380
+      fleet:
+        public-ip: $private_ipv4   # used for fleetctl ssh command
+        metadata: "size=#{size},name=#{name}"
+      units:
+        - name: etcd2.service
+          command: start
+        - name: fleet.service
+          command: start
+vms:
+  -
+    name: vm1
+    size: 1gb
+  -
+    name: vm2
+    size: 512mb
+  -
+    name: vm3
+    size: 512mb
+```
+
+This demonstrates a few more things:
+
+1. The config can be split over multiple files using `file:`, in this config file the digital ocean access token is specified in a different file.
+2. In `user_data` vm configuration variables can be substituted, see `#{size}` and `#{name}` in the metadata.

data/sistero.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.name
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency "droplet_kit", "~> 1.3"
+  spec.add_dependency "droplet_kit", "~> 3.14"
   spec.add_dependency "moister", "~> 0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.3
 platform: ruby
 authors:
 - James Pike
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: moister
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ homepage: http://github.com/ohjames/sistero
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Profile based digital ocean cluster management command line tool.
 test_files: []