sistero 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e493aa279919d567e6a6eb2d0980dcd3ec412374
-  data.tar.gz: f222d218205101e767a903382b34928636e3a5cd
+SHA256:
+  metadata.gz: f235e9d54734e98384ab4f4cc22e09c6b90db8b9cd788da9a240448245c5fc98
+  data.tar.gz: a435ca3f77f729d317e44e029d6f2c7df0857b5374b38ee948410a7a939229e8
 SHA512:
-  metadata.gz: 04e07114fafb07c5ca60ec829c9c7664cab53c6d7783bd4fecd38a8da8e79334cbf4c32569f34daad8b7f08b363cda31f1ae4b3dcb450054403381966d37dc0f
-  data.tar.gz: 16799fcaa0100ae937347ca44eb52d4d6cc5a76ae9a952acb04eba4711e24320a8fa891fbbe2c8ab40ebb91d6515e2b0d87e1e121ea4ddeb424397e3551da630
+  metadata.gz: 21a7e25013fac34584e0bfabd3f0ffd3e24e11f26d61744b7ef3c30f3971f3b8a799a99a8cf4f727a03867e3e13045465e893386ddfb5013d3eff57c9ab379d1
+  data.tar.gz: c37a09b748bc6b9c38e78e817b60e8f5bc0e2ca87d9fcaa1af51c82c398e12c69200167b5d63a59f1fb6b294e7e46be8f49be6bc25eebe20993e4b18eac4cd7a

data/bin/sistero

@@ -24,10 +24,12 @@ module Sistero::Command
       op.on '-c', '--config file', 'override path to config file', 'cfg_file_path'
       op.on '-d', '--directory dir', 'set working dir', 'directory'
 
-      op.subcommand 'ssh [vm]', 'ssh to vm' do |subop|
+      op.subcommand 'ssh [vm] [*run]', 'ssh to vm' do |subop|
         subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
+      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'
       op.subcommand 'destroy [*vms]', 'destroy vm'
@@ -56,12 +58,13 @@ module Sistero::Command
 
     case command
     when 'ssh'
-      # TODO: pass ssh_args
-      sistero.ssh_to_vm(command_cfg.vm, ssh_options: command_cfg.ssh_options)
+      sistero.ssh_to_vm(command_cfg.vm, ssh_options: command_cfg.ssh_options, run: command_cfg.run)
+    when 'rsync'
+      sistero.rsync(command_cfg.vm, cmd: command_cfg.cmd)
     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.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
 
@@ -65,33 +65,33 @@ module Sistero
       return false
     end
 
-    def ssh_to_vm(name, ssh_options: nil)
+    def ssh_to_vm(name, ssh_options: nil, run: nil)
       vm, name = get_vm name
       ssh_options ||= vm.ssh_options
 
       droplet = find_droplet(name) || create_droplet_from_vm(name)
-      public_network = droplet.networks.v4.find { |network| network.type == 'public' }
-      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' }
-      end
-      ip = public_network.ip_address
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
 
-      unless is_port_open? ip, 22
-        puts "waiting for ssh port to open"
-        sleep 1
-        until is_port_open? ip, 22 do
-          sleep 1
-        end
+      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{public_ip}"
+      unless run.empty?
+        cmd += ' ' + run.join(' ')
       end
 
-      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{ip}"
-      puts cmd
+      # puts cmd
       exec cmd
     end
 
+    def rsync(name, cmd: nil)
+      vm, name = get_vm name
+      droplet = find_droplet(name) || create_droplet_from_vm(name)
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
+
+      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{public_ip}:")
+      exec cmd_str
+    end
+
     def destroy_vm(name)
       vm, name = get_vm name
 
@@ -143,5 +143,32 @@ module Sistero
         puts "  regions       #{image.regions.join ', '}"
       end
     end
+
+    private
+    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(droplet.name)
+        public_network = find_public_network droplet
+      end
+      public_network.ip_address
+    end
+
+    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? public_ip, 22 do
+          sleep 1
+        end
+      end
+    end
   end
 end

data/lib/sistero/config.rb

@@ -46,7 +46,7 @@ module Sistero
             @cfg_file_path = cfg_file_path
             break
           end
-          directory = File.dirname directory
+          directory = File.expand_path '..', directory
           break if directory == '/'
         end
 

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.7.1'
+  VERSION = '0.8.1'
 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,7 +26,7 @@ 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"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - James Pike
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2020-12-30 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
@@ -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.1.4
+signing_key:
 specification_version: 4
 summary: Profile based digital ocean cluster management command line tool.
 test_files: []