vagrant-orchestrate 0.6.0 → 0.6.1.patch

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf8bdc44383203b8cc60e708fbd4ef931c88897
-  data.tar.gz: 2917a0107512412d3c210c78fd1ba0c10e895d19
+  metadata.gz: 23757b8b0878a48a5c9e30518eab353976e14f0d
+  data.tar.gz: 40b510fdba26c874cc9d9c9272320d8c09788a24
 SHA512:
-  metadata.gz: 90e979ed582054c9f26c9458779103ca7f30230b5733843e57f46f4cae8932f8024abc00aa9eaf02c7042996761554842afeb99a04c7fe652c0a2f816b8db146
-  data.tar.gz: cf23917f10e5672b2372690dcf57ee61d6a1135ee44a503d709c8753475e4d944d6da01e7227b027612dfc15cb59152fd4b5c3b44b40f194af7861906c215f90
+  metadata.gz: f49f2d4c970ecd5c325a7eb48997469d5b9106c68822868d375f9e5bf6aa5c74eea302f7311e0c700811bea8ba221214c8f2c110416fcb5daa8889a095dbc1cb
+  data.tar.gz: 9970f9430d76df081bf1629230dc4d1e8aceea7c0553e790d68002e5026c029b264f289318717980762fe2b1705263f5fc611cf64be0f2e3e51f2daf6b904287

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.6.1 (May 18th, 2015)
+
+  - Change the credentials manager to add the `smb_username` and `smb_password` to
+  the synced folders for a machine if the communicator is `winrm`. For Windows,
+  this means only a single credential prompt.
+
 0.6.0 (May 15th, 2015)
 
   - Refactor the push command to compose middleware actions rather than performing

data/README.md

@@ -6,7 +6,7 @@
 ![](http://i.imgur.com/71yAw5v.gif)
 
 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.
+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
 and is designed from the ground up to be cross-platform, with first class support for **Windows,
 Linux, and Mac**.
@@ -14,9 +14,10 @@ Linux, and Mac**.
 ## Quick start
 
 ```
-$ vagrant orchestrate init --shell --shell-inline "echo Hello" \
-  --servers myserver1.mydomain.com,myserver2.mydomain.com \
-  --ssh-username USERNAME --ssh-private-key-path PATH
+$ vagrant orchestrate init --servers myserver1.mydomain.com,myserver2.mydomain.com \
+  --ssh-username USERNAME --ssh-private-key-path PATH \
+  --shell --shell-inline "echo Hello"
+
 $ ls
 Vagrantfile	  dummy.box
 $ vagrant orchestrate push
@@ -38,7 +39,7 @@ $ vagrant orchestrate push
 ==> managed-myserver2.mydomain.com:  -- Server: myserver2.mydomain.com
 ```
 
-This also works for Windows with the `--winrm --winrm-username USERNAME --wirnm-password PASSWORD` parameters, but currently must be initiated from a Windows host.
+This also works for Windows with the `--winrm --winrm-username USERNAME --wirnm-password PASSWORD` parameters, but  must be initiated from a Windows host.
 
 ## Usage
 
@@ -86,8 +87,8 @@ end
 
 You'll need to edit your Vagrantfile and replace some variables, such as ssh username and
 private key, and the path to the script to run. Alternatively, you can pass them on the command
-line with `--ssh-username` and `--ssh-private-key-path`. The first line of the file defines an array of
-managed servers that the `push` command will operate on.
+line with `--ssh-username` and `--ssh-private-key-path`. The first line of the file defines an whitespace delimeted
+array of managed servers that the `push` command will operate on.
 
 ```ruby
 managed_servers = %w( myserver1.mydomain.com myserver2.mydomain.com )
@@ -96,7 +97,7 @@ managed_servers = %w( myserver1.mydomain.com myserver2.mydomain.com )
 
 This works for Windows managed servers using WinRM as well
 
-    $ vagrant orchestrate init --winrm [--winrm-username USERNAME --winrm-password PASSWORD]
+    $ vagrant orchestrate init --winrm --winrm-username USERNAME --winrm-password PASSWORD
 
 ```ruby
   required_plugins = %w( vagrant-managed-servers vagrant-winrm-s )
@@ -104,14 +105,13 @@ This works for Windows managed servers using WinRM as well
 ...
 
   config.vm.communicator = "winrm"
-  config.winrm.username = "{{YOUR_WINRM_USERNAME}}"
-  config.winrm.password = "{{YOUR_WINRM_PASSWORD}}"
-  config.winrm.transport = :sspinegotiate
+  config.winrm.username = "USERNAME"
+  config.winrm.password = "PASSWORD"
 ```
 
 #### Plugins
 
-This also supports a portable way to install plugins, just list them in the required_plugins section
+This also supports a portable and repeatable way to install plugins, just list them in the required_plugins section
 
 ```ruby
 required_plugins = %w( vagrant-managed-servers vagrant-hostsupdater )
@@ -217,16 +217,11 @@ sc config winrm type= own
 1. Fork it ( https://github.com/Cimpress-MCP/vagrant-orchestrate/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-
-## Development Flow
+4. Run locally with `bundle exec vagrant orchestrate [init|push|status]`
+5. `bundle exec rake build`
+6. `bundle exec rake acceptance`, which will take a few minutes
+7. Push to the branch (`git push origin my-new-feature`)
+8. Create a new Pull Request
 
 Prerequisites:
 * Ruby 2.0 or greater
-
-Flow:
-1. Develop your feature
-2. Run locally with `bundle exec vagrant orchestrate [init|push|status]`
-3. `bundle exec rake build`
-4. `bundle exec rake acceptance`, which will take a few minutes

data/docs/environments.md

@@ -80,3 +80,11 @@ Current machine states:
 
 local                     not created (virtualbox)
 ```
+
+## Init
+
+Vagrant Orchestrate will template the Vagrantfile and servers.json using `vagrant orchestrate init --environments dev,test,prod`. You will need to specify the servers that exist in each environment in the servers.json file and also create each of the appropriate branches.
+
+## Merge conflicts
+
+Early in the development process, we experimented with a different servers.json file per branch, meaning that the servers.json in the dev branch would only list servers that existed in dev. This created many merge conflicts and this friction quickly led to frustration. In the end, we asserted that the servers.json file should be the same across environments in order to remove the merge conflicts from the equation. This means there is a higher cost to adding a new server because it needs to be added to all environment branches, but in my experience, servers change less often than code. 

data/docs/puppet.md

@@ -1,6 +1,6 @@
 # Puppet
 
-Experimental [puppet templating](docs/puppet.md) support is available as well with the `--puppet` flag and associated options
+Experimental puppet templating support is available with the `--puppet` flag and associated options
 
 ```ruby
   required_plugins = %w( vagrant-managed-servers vagrant-librarian-puppet )
@@ -18,9 +18,7 @@ The following files and folders will be placed in the puppet directory
 
 ```
 Puppetfile
-Vagrantfile
-dummy.box
-hiera/
+hieradata/
   common.yaml
 hiera.yaml
 manifests/

data/docs/strategy.md

@@ -1,7 +1,6 @@
 # Deployment Strategies
 
-Vagrant Orchestrate supports several deployment strategies including parallel and
-half and half. Here we'll cover how to use the various strategies as well as describing
+Vagrant Orchestrate supports several deployment strategies that allow you to orchestrate the behavior pushes to remote servers. Here we'll cover how to use the various strategies as well as describing
 situations when each might be useful.
 
 ## Strategies
@@ -36,6 +35,8 @@ provision [trigger](https://github.com/emyl/vagrant-triggers) to run a smoke tes
 
     config.orchestrate.strategy = :canary
 
+The prompt can be surpressed with the `--force` (`-f`) flag.
+
 ### Half and Half
 Deploys to half of the cluster in parallel, then the other half, with
 a pause in between. This won't manage any of your load balancing or networking
@@ -76,9 +77,8 @@ Alternatively, you can specify the deployment strategy in your Vagrantfile
 
 Command line parameters take precedence over configuration values set in the Vagrantfile.
 
-
 ## Suppressing Prompts
-In order to automate the deployment process, it can be very useful to suppress
+In order to automate the deployment process, you'll need to suppress
 prompts. You can achieve that in two ways:
 
 From the command line, add the `--force` or `-f` parameters

data/lib/vagrant-managed-servers/action.rb

@@ -26,6 +26,46 @@ module VagrantPlugins
           b.use DownloadStatus
         end
       end
+
+      # !!!!!!!!!!!!!!!!!!!!!! "TEMPORARY" PATCH !!!!!!!!!!!!!!!!!!!!!!!
+      # I'm adding the SMB support here, while I wait on feedback for
+      # https://github.com/tknerr/vagrant-managed-servers/pull/47
+      # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      # This action is called when `vagrant provision` is called.
+      # rubocop:disable MethodLength
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use WarnNetworks
+          b.use Call, IsLinked do |env, b2|
+            unless env[:result]
+              b2.use MessageNotLinked
+              next
+            end
+
+            # rubocop:disable Lint/ShadowingOuterLocalVariable
+            b2.use Call, IsReachable do |env, b3|
+              unless env[:result]
+                b3.use MessageNotReachable
+                next
+              end
+
+              b3.use Provision
+              if env[:machine].config.vm.communicator == :winrm
+                # Use the builtin vagrant folder sync for Windows target servers.
+                # This gives us SMB folder sharing, which is much faster than the
+                # WinRM uploader for any non-trivial number of files.
+                b3.use Vagrant::Action::Builtin::SyncedFolders
+              else
+                # Vagrant managed servers custom implementation
+                b3.use SyncFolders
+              end
+            end
+            # rubocop:enable Lint/ShadowingOuterLocalVariable
+          end
+        end
+        # rubocop:enable MethodLength
+      end
     end
   end
 end

data/lib/vagrant-orchestrate/action/setcredentials.rb

@@ -38,6 +38,15 @@ module VagrantPlugins
             config.username = username
             config.password = password
           end
+
+          # If we're using WinRM, then we'll want to use SMB folder sync, which
+          # requires creds.
+          return unless machine.config.vm.communicator == :winrm
+          machine.config.vm.synced_folders.each do |_id, data|
+            puts data[:type]
+            data[:smb_username] = username
+            data[:smb_password] = password
+          end
         end
 
         def prompt_username(ui)

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.6.0"
+    VERSION = "0.6.1.patch"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1.patch
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,9 +141,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14