joyent-provisioner 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 350a79b3f24e51021a8dc22a4cb86b2b6837057b
-  data.tar.gz: e4a41ef07b05cf7c368c3e23b5b1f64172bedf60
+  metadata.gz: 112ca66cf4b1b153f6ec273ff04ba83ae59cd053
+  data.tar.gz: ea701940d4b0dddd2af5d402c2eac05952bfc88a
 SHA512:
-  metadata.gz: 263f08be6a827e1792ea584d948210245419654c49eb2e895eaa2fc72c8e8cd72ff986d91a06080950a83e41b77cdca936a420f5c12c59cbbacc782d4460789b
-  data.tar.gz: 7ec513c91bbbdf36f720bd9a79be84c2ec83665f8cb77604ebbf39f3353c5f9d1b84a26e035afab9c8455a33b40def38aa13eb63b544de95f861b3f7ce22fc30
+  metadata.gz: 66e9595db1d605ef08471a86eb2632c71a3629f9ad352bb3e831731520870b2cca5733e570b90759b25837d52df81db51aaba068acaeb6d8f7088ecf039d8196
+  data.tar.gz: fc21b4800f1addad8e44cbc17b1dcbf70398a662594e597f68fb297e5f580fac34545a59413073a220b01c65f8a819ccbfd8e6d1b0c1449bad160356f3ddd9ac

data/lib/provisioner/cli/bootstrap.rb

@@ -5,6 +5,19 @@ class Provisioner::CLI::Bootstrap < Provisioner::CLI
 
   banner 'Usage: provisioner bootstrap --config <path-to-config>.yml [options] '
 
+  option :reset,
+         short: '-R',
+         long: '--reset',
+         description: 'Path to the config file (YML)',
+         boolean: true,
+         required: false
+
+  option :sudo,
+         long: '--sudo',
+         description: 'Execute bootstrap via sudo',
+         boolean: false,
+         required: false
+
   def run(argv = ARGV)
     parse_options argv
     enable_logger if config[:debug]
@@ -19,7 +32,7 @@ class Provisioner::CLI::Bootstrap < Provisioner::CLI
   end
 
   def provisioner_command
-    Provisioner::Command::Bootstrap.new(template_configuration.for_template(config[:template]), config[:number], config[:ssh_user])
+    Provisioner::Command::Bootstrap.new(template_configuration.for_template(config[:template]), config)
   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], config[:ssh_user])
+    Provisioner::Command::Provision.new(template_configuration.for_template(config[:template]), config)
   end
 
 end

data/lib/provisioner/command/base.rb

@@ -3,14 +3,15 @@ module Provisioner
     class Base
       attr_accessor :image, :flavor, :distro, :networks, :run_list,
                     :host_sequence, :host_prefix, :environment, :host_suffix,
-                    :host_presuffix, :log_dir, :host_number, :ssh_user
+                    :host_presuffix, :log_dir, :host_number, :options, :ssh_user
 
-      def initialize(template_configuration, host_number=nil, ssh_user=nil)
-        @host_number = host_number
+      def initialize(template_configuration, options = {})
+        @options = options
+        @host_number = options[:number]
         template_configuration.each_pair do |key, value|
           self.send("#{key}=", value)
         end
-        @ssh_user = ssh_user if ssh_user
+        @ssh_user = options[:ssh_user] if options[:ssh_user]
         raise "Log path is required" unless @log_dir
         Dir.mkdir(log_dir) unless Dir.exists?(log_dir)
       end

data/lib/provisioner/command/bootstrap.rb

@@ -2,12 +2,22 @@ module Provisioner
   module Command
     class Bootstrap < Base
 
+      def use_sudo?
+        options[:sudo]
+      end
+
       private
 
       def shell_commands_for(number)
         host = HostCommand.new(host_name(number), self)
 
-        [host.reset_command, host.bootstrap_command]
+        commands = []
+        commands << host.reset_command if reset_chef?
+        commands << host.bootstrap_command
+      end
+
+      def reset_chef?
+        options[:reset]
       end
 
       class HostCommand
@@ -36,6 +46,7 @@ module Provisioner
 
           bootstrap_command << "--run-list #{context.run_list}" if context.run_list
           bootstrap_command << "--ssh-user #{context.ssh_user}"
+          bootstrap_command << '--sudo' if context.use_sudo?
           bootstrap_command << "2>&1 > #{context.log_dir}/#{name}_provision.log &"
           bootstrap_command.join(' ')
         end

data/lib/provisioner/version.rb

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

data/spec/provisioner/command/bootstrap_spec.rb

@@ -25,7 +25,7 @@ describe Provisioner::Command::Bootstrap do
 
     context 'host is specified' do
 
-      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, '1') }
+      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, number: '1') }
 
       let(:expected_bootstrap_command) { [
           'knife bootstrap 1.2.3.4',
@@ -38,13 +38,30 @@ describe Provisioner::Command::Bootstrap do
       ].join(' ') }
 
       it 'returns command string' do
-        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)
+        expect(shell_commands[0]).to eq(expected_bootstrap_command)
       end
     end
 
     context 'ssh user is overridden' do
-      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, '1', 'root') }
+      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, number: '1', ssh_user: '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(expected_bootstrap_command)
+      end
+    end
+
+    context 'reset is true' do
+      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, number: '1', ssh_user: 'root', reset: true) }
 
       let(:expected_bootstrap_command) { [
           'knife bootstrap 1.2.3.4',
@@ -61,6 +78,25 @@ describe Provisioner::Command::Bootstrap do
         expect(shell_commands[1]).to eq(expected_bootstrap_command)
       end
     end
+
+    context 'sudo is true' do
+      let(:subject) { Provisioner::Command::Bootstrap.new(template_configuration, number: '1', ssh_user: 'root', sudo: true) }
+
+      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',
+          '--sudo',
+          '2>&1 > ./tmp/memcached-sessions001.c1.test_provision.log &'
+      ].join(' ') }
+
+      it 'returns command string' do
+        expect(shell_commands[0]).to eq(expected_bootstrap_command)
+      end
+    end
   end
 end
 

data/spec/provisioner/command/provision_spec.rb

@@ -7,7 +7,7 @@ describe Provisioner::Command::Provision do
 
     context 'host is specified' do
 
-      let(:subject) { Provisioner::Command::Provision.new(template_configuration, '1') }
+      let(:subject) { Provisioner::Command::Provision.new(template_configuration, number: '1') }
       let(:expected_command) { [
           'knife joyent server create',
           '--image 9ec5c0c-a941-11e2-a7dc-57a6b041988f',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Wrapper gem around provisioning clusters of servers on Joyent cloud