joyent-provisioner 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 350a79b3f24e51021a8dc22a4cb86b2b6837057b
+  data.tar.gz: e4a41ef07b05cf7c368c3e23b5b1f64172bedf60
+SHA512:
+  metadata.gz: 263f08be6a827e1792ea584d948210245419654c49eb2e895eaa2fc72c8e8cd72ff986d91a06080950a83e41b77cdca936a420f5c12c59cbbacc782d4460789b
+  data.tar.gz: 7ec513c91bbbdf36f720bd9a79be84c2ec83665f8cb77604ebbf39f3353c5f9d1b84a26e035afab9c8455a33b40def38aa13eb63b544de95f861b3f7ce22fc30

data/lib/provisioner/cli.rb

@@ -48,6 +48,12 @@ module Provisioner
                  description: 'Ruby range or a number for the host, ie 3 or 1..3 or [2,4,6]',
                  required: false
 
+          option :ssh_user,
+                 short: '-l SSH_USERNAME',
+                 long: '--user SSH_USERNAME',
+                 description: 'SSH user used to connect to server (overrides yml configuration)',
+                 required: false
+
           option :dry,
                  long: '--dry-run',
                  description: 'Dry runs and prints all commands without executing them',

data/lib/provisioner/cli/bootstrap.rb

@@ -19,7 +19,7 @@ class Provisioner::CLI::Bootstrap < Provisioner::CLI
   end
 
   def provisioner_command
-    Provisioner::Command::Bootstrap.new(template_configuration.for_template(config[:template]), config[:number])
+    Provisioner::Command::Bootstrap.new(template_configuration.for_template(config[:template]), config[:number], config[:ssh_user])
   end
 
 end

data/lib/provisioner/cli/provision.rb

@@ -19,7 +19,7 @@ class Provisioner::CLI::Provision < Provisioner::CLI
   end
 
   def provisioner_command
-    Provisioner::Command::Provision.new(template_configuration.for_template(config[:template]), config[:number])
+    Provisioner::Command::Provision.new(template_configuration.for_template(config[:template]), config[:number], config[:ssh_user])
   end
 
 end

data/lib/provisioner/command/base.rb

@@ -5,11 +5,12 @@ module Provisioner
                     :host_sequence, :host_prefix, :environment, :host_suffix,
                     :host_presuffix, :log_dir, :host_number, :ssh_user
 
-      def initialize(template_configuration, host_number=nil)
+      def initialize(template_configuration, host_number=nil, ssh_user=nil)
         @host_number = host_number
         template_configuration.each_pair do |key, value|
           self.send("#{key}=", value)
         end
+        @ssh_user = ssh_user if ssh_user
         raise "Log path is required" unless @log_dir
         Dir.mkdir(log_dir) unless Dir.exists?(log_dir)
       end

data/lib/provisioner/version.rb

@@ -1,3 +1,3 @@
 module Provisioner
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/provisioner/command/bootstrap_spec.rb

@@ -2,25 +2,31 @@ require 'spec_helper'
 
 describe Provisioner::Command::Bootstrap do
   describe '#shell_commands' do
+    let(:template_configuration) { {
+        image: '9ec5c0c-a941-11e2-a7dc-57a6b041988f',
+        flavor: 'g3-highmemory-17.125-smartos',
+        distro: 'smartos-base64',
+        networks: '42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f',
+        host_sequence: '1..2',
+        host_suffix: 'test',
+        host_presuffix: 'c1',
+        host_prefix: 'memcached-sessions',
+        environment: 'test',
+        log_dir: './tmp',
+        run_list: 'role[joyent]',
+        ssh_user: 'ops'
+    } }
+
+    let(:shell_commands) { subject.shell_commands }
+
+    before do
+      Provisioner::Command::Bootstrap::HostCommand.any_instance.stub(:ip_for_host) { '1.2.3.4' }
+    end
+
     context 'host is specified' do
 
       let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, '1') }
 
-      let(:template_configuration) { {
-          image: '9ec5c0c-a941-11e2-a7dc-57a6b041988f',
-          flavor: 'g3-highmemory-17.125-smartos',
-          distro: 'smartos-base64',
-          networks: '42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f',
-          host_sequence: '1..2',
-          host_suffix: 'test',
-          host_presuffix: 'c1',
-          host_prefix: 'memcached-sessions',
-          environment: 'test',
-          log_dir: './tmp',
-          run_list: 'role[joyent]',
-          ssh_user: 'ops'
-      } }
-
       let(:expected_bootstrap_command) { [
           'knife bootstrap 1.2.3.4',
           '--distro smartos-base64',
@@ -32,13 +38,29 @@ describe Provisioner::Command::Bootstrap do
       ].join(' ') }
 
       it 'returns command string' do
-        Provisioner::Command::Bootstrap::HostCommand.any_instance.stub(:ip_for_host) { '1.2.3.4' }
-        shell_commands = subject.shell_commands
-
         expect(shell_commands[0]).to eq("ssh 1.2.3.4 -l ops 'sudo rm -rf /etc/chef'")
         expect(shell_commands[1]).to eq(expected_bootstrap_command)
       end
     end
+
+    context 'ssh user is overridden' do
+      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, '1', 'root') }
+
+      let(:expected_bootstrap_command) { [
+          'knife bootstrap 1.2.3.4',
+          '--distro smartos-base64',
+          '--environment test',
+          '--node-name memcached-sessions001.c1.test',
+          '--run-list role[joyent]',
+          '--ssh-user root',
+          '2>&1 > ./tmp/memcached-sessions001.c1.test_provision.log &'
+      ].join(' ') }
+
+      it 'returns command string' do
+        expect(shell_commands[0]).to eq("ssh 1.2.3.4 -l root 'sudo rm -rf /etc/chef'")
+        expect(shell_commands[1]).to eq(expected_bootstrap_command)
+      end
+    end
   end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -11,76 +10,67 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: knife-joyent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,81 +85,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper gem around provisioning clusters of servers on Joyent cloud
@@ -219,33 +198,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2750024294066364636
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2750024294066364636
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper gem around provisioning clusters of servers on Joyent cloud
 test_files:
 - spec/fixtures/test.yml