vagrant-orchestrate 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 997cea86aee854008a850c48c1593a03d1d543fd
-  data.tar.gz: b3779aab0db5c26a0e9490aa21ac9015f0f0b6d4
+  metadata.gz: f8bd501392dfda5915b4bbc00a06d46a27dd08c9
+  data.tar.gz: 0280f99653f43635042074898fd54ddbf428231c
 SHA512:
-  metadata.gz: 5ad720a6e0e8f172b4f01507764537eb52f4fdec5f7d72308a799870809d65bedd69b831ec2d7b3813735549c517e4af910a15f8fd9a6bc616706fa8c2293e0a
-  data.tar.gz: 005dd4b6c151cd3c09b9cc688f59f9137b2d0c7832ddd54d5afc5f8b48bd4556a06801e9e96189c683cb3d496ad42ff1e5aea03d50c3098150af7ce9cc27bbc4
+  metadata.gz: e411ded7b83942b15f621d0c9ac97ef170b0a0748fafc294e591268a7eb8ce8bd76ccde29b79593223103440d5f8334c5567730091c2381b0ba65b1c44ff8201
+  data.tar.gz: 6dd06ba49cd7ce2b4ae961edc2f9cf267f51c9fb4f5ba31d219daab4dd99af92b0527e712c75619d7eebb3cf099e80edecb5b8ca149a6d4ed33551aa16a954f7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.5.2 (May 8th, 2015)
+
+  - Add the `--no-provision` option to the `orchestrate push` command. Useful for
+  first timers to gain confidence in using the tool or to be able to just reboot servers.
+  - Move the `winrm.transport = :sspinegotiate` declaration from the config level
+  to within the managed server section, allowing local Windows VMs to work again.
+  - Change the default for --puppet-librarian-puppet to false, as it was impacting
+  many Windows users.
+
 0.5.1 (April 27th, 2015)
 
   - Also short circuit a push operation with an error message if there are untracked files.

data/README.md

@@ -7,7 +7,7 @@
 
 This is a Vagrant 1.6+ plugin that allows orchestrated deployments
 to already provisioned (non-elastic) servers on top of the excellent [vagrant-managed-servers](http://github.com/tknerr/vagrant-managed-servers) plugin.
-It features a powerful templating `init` command, support for multiple environments, several deployment strategies 
+It features a powerful templating `init` command, support for multiple environments, several deployment strategies
 and is designed from the ground up to be cross-platform, with first class support for **Windows,
 Linux, and Mac**.
 
@@ -192,10 +192,23 @@ managed-3  Status unavailable.
 managed-4  2015-04-19 00:43:07 UTC  e983dddd8041c5db77494266328f1d266430f57d  cbaldauf
 ```
 
-## Tips for Windows hosts
+## Windows
+
+### Host
 
 * Need rsync? Install [OpenSSH](http://www.mls-software.com/opensshd.html) and then run this [script](https://github.com/joefitzgerald/packer-windows/blob/master/scripts/rsync.bat) to install rsync. Vagrant managed servers currently only works with cygwin based rsync implementations.
-* If you're using winrm-s as your communicator, you'll need to configure it first on the target machine! Check out [the plugin readme](https://github.com/Cimpress-MCP/vagrant-winrm-s/blob/master/README.md#setting-up-your-server) for instructions on how to set this up.
+
+### Managed Guest
+You'll need to bootstrap the target machine. The following script should get you there.
+
+```
+winrm quickconfig
+winrm set winrm/config/service/auth @{Negotiate="true"}
+winrm set winrm/config/service @{AllowUnencrypted="false"}
+sc config winrm start= auto
+sc config winrm type= own
+```
+* Check out [the winrm-s readme](https://github.com/Cimpress-MCP/vagrant-winrm-s/blob/master/README.md#setting-up-your-server) for more information
 
 ## Contributing
 

data/Rakefile

@@ -17,7 +17,8 @@ task :acceptance do
   # To ensure the ntp sync happens even if the servers are already up
   system("vagrant provision /local/")
   ENV["VAGRANT_ORCHESTRATE_NO_GUARD_CLEAN"] = "true"
-  system("bundle exec vagrant-spec test --components=orchestrate/push orchestrate/prompt orchestrate/status")
+  system("bundle exec vagrant-spec test \
+    --components=orchestrate/push orchestrate/prompt orchestrate/status orchestrate/provision")
   puts "Destroying target servers"
   system("vagrant destroy -f /local/")
 end

data/Vagrantfile

@@ -2,6 +2,7 @@ managed_servers = %w( 192.168.10.80 192.168.10.81 192.168.10.82 192.168.10.83)
 
 Vagrant.configure(2) do |config|
   config.orchestrate.filter_managed_commands = true
+  config.vm.provision :shell, inline: "echo hello"
 
   # These boxes are defined locally to enable acceptance testing. Spinning up
   # real boxes in the vagrant-spec environment was expensive because it ignored

data/acceptance/command/provision_spec.rb

@@ -0,0 +1,24 @@
+require "vagrant-spec"
+
+describe "vagrant orchestrate provision", component: "orchestrate/provision" do
+  include_context "acceptance"
+
+  # This unique string gets echo'd as part of the provisioning process, so we
+  # can check the output for this string. See ../support-skeletons/provision/Vagrantfile
+  # for more info.
+  PROVISION_STRING = "6etrabEmU8ru8hapheph"
+
+  before do
+    environment.skeleton("provision")
+  end
+
+  it "Runs the shell provisioner" do
+    result = execute("vagrant", "orchestrate", "push", "managed-1")
+    expect(result.stdout).to include(PROVISION_STRING)
+  end
+
+  it "Doesn't run with --no-provision" do
+    result = execute("vagrant", "orchestrate", "push", "managed-1", "--no-provision")
+    expect(result.stdout).not_to include(PROVISION_STRING)
+  end
+end

data/acceptance/support-skeletons/basic/Vagrantfile

@@ -7,7 +7,6 @@ Vagrant.configure(2) do |config|
       managed.vm.provision "shell", inline: "date > /tmp/sync_time; sleep 3"
       managed.vm.box = "managed-server-dummy"
       managed.vm.box_url = "./dummy.box"
-      # TODO: Why in the world do I need this? I thought it was the default!
       managed.ssh.password = "vagrant"
       managed.vm.provider :managed do |provider|
         provider.server = server

data/acceptance/support-skeletons/provision/Vagrantfile

@@ -0,0 +1,18 @@
+managed_servers = %w( 192.168.10.80 192.168.10.81 192.168.10.82 192.168.10.83 )
+
+Vagrant.configure(2) do |config|
+  # Print a unique string that we can check the output for
+  config.vm.provision :shell, inline: "echo 6etrabEmU8ru8hapheph"
+
+  managed_servers.each_with_index do |server, index|
+    config.vm.define "managed-#{index + 1}" do |managed|
+      managed.vm.provision "shell", inline: "echo 'hello world'"
+      managed.vm.box = "managed-server-dummy"
+      managed.vm.box_url = "./dummy.box"
+      managed.ssh.password = "vagrant"
+      managed.vm.provider :managed do |provider|
+        provider.server = server
+      end
+    end
+  end
+end

data/lib/vagrant-orchestrate/command/init.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
           options[:servers] = []
           options[:environments] = []
           options[:plugins] = DEFAULT_PLUGINS
-          options[:puppet_librarian_puppet] = true
+          options[:puppet_librarian_puppet] = false
           options[:puppet_hiera] = true
 
           opts = OptionParser.new do |o|

data/lib/vagrant-orchestrate/command/push.rb

@@ -27,11 +27,16 @@ module VagrantPlugins
         def execute
           options = {}
           options[:force] = @env.vagrantfile.config.orchestrate.force_push
+          options[:provision] = true
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant orchestrate push"
             o.separator ""
 
+            o.on("--[no-]provision", "Enable or disable provisioning. Default is true") do |p|
+              options[:provision] = p
+            end
+
             o.on("--reboot", "Reboot a managed server after the provisioning step") do
               options[:reboot] = true
             end
@@ -111,7 +116,7 @@ module VagrantPlugins
             ENV["VAGRANT_ORCHESTRATE_COMMAND"] = "PUSH"
             begin
               batchify(machines, :up, options)
-              batchify(machines, :provision, options)
+              batchify(machines, :provision, options) if options[:provision]
               upload_status_all(machines)
               batchify(machines, :reload, options) if options[:reboot]
             ensure

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/spec/vagrant-orchestrate/command/init_spec.rb

@@ -169,7 +169,16 @@ describe VagrantPlugins::Orchestrate::Command::Init do
         expect(iso_env.vagrantfile.config.vm.communicator).to eq(:winrm)
         expect(iso_env.vagrantfile.config.winrm.username).to eq(described_class::DEFAULT_WINRM_USERNAME)
         expect(iso_env.vagrantfile.config.winrm.password).to eq(described_class::DEFAULT_WINRM_PASSWORD)
-        expect(iso_env.vagrantfile.config.winrm.transport).to eq(:sspinegotiate)
+        expect(iso_env.vagrantfile.config.winrm.transport).to eq(:plaintext)
+      end
+    end
+
+    describe "sspinegotiate" do
+      let(:argv) { ["--winrm", "--servers", "server1"] }
+      it "creates a vagrantfile with the winrm communicator" do
+        subject.execute
+        config = iso_env.vagrantfile.machine_config(:server1, :managed, nil)[:config]
+        expect(config.winrm.transport).to eq(:sspinegotiate)
       end
     end
 
@@ -272,6 +281,8 @@ describe VagrantPlugins::Orchestrate::Command::Init do
         subject.execute
         vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
         expect(vagrantfile).to include("managed_servers = %w( server1 server2 )")
+        expect(iso_env.vagrantfile.machine_config(:server1, :managed, nil)).to_not be_nil
+        expect(iso_env.vagrantfile.machine_config(:server2, :managed, nil)).to_not be_nil
       end
     end
   end

data/templates/vagrant/Vagrantfile.erb

@@ -56,7 +56,6 @@ Vagrant.configure("2") do |config|
   config.vm.communicator = "<%= communicator %>"
   config.winrm.username = "<%= winrm_username %>"
   config.winrm.password = "<%= winrm_password %>"
-  config.winrm.transport = :sspinegotiate
   <% end -%>
 
   config.vm.define "local", primary: true do |local|
@@ -70,6 +69,9 @@ Vagrant.configure("2") do |config|
       box.vm.provider :managed do |provider|
         provider.server = instance
       end
+      <% if communicator == "winrm" =%>
+      box.winrm.transport = :sspinegotiate
+      <% end -%>
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,12 +84,15 @@ files:
 - Rakefile
 - Vagrantfile
 - acceptance/command/prompt_spec.rb
+- acceptance/command/provision_spec.rb
 - acceptance/command/push_spec.rb
 - acceptance/command/status_spec.rb
 - acceptance/support-skeletons/basic/Vagrantfile
 - acceptance/support-skeletons/basic/dummy.box
 - acceptance/support-skeletons/prompt/Vagrantfile
 - acceptance/support-skeletons/prompt/dummy.box
+- acceptance/support-skeletons/provision/Vagrantfile
+- acceptance/support-skeletons/provision/dummy.box
 - docs/environments.md
 - docs/puppet.md
 - docs/strategy.md