vagrant-rackspace 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c154b6d9ba1e6a974a32630ee8772c5fc85ec9d1
-  data.tar.gz: 74eb7ba525a976cda9b66a2509200b5581ecaf7b
+  metadata.gz: 30e398c24dbf1f93ba132f6e0f2d11e8743c844e
+  data.tar.gz: 8d9a766ee9c1f70c16af9e4d2dd413e1977368ad
 SHA512:
-  metadata.gz: 33ce385cd1ec29e0d141f8cbbd0ae84d0907c6f35ef698071bd9653e86a902dac0273b732d23ebb7b03b8dc5fdbf72c31d742244ef93e7b336ba322d0ac07bd8
-  data.tar.gz: 52a4d2b9a4bee5d33c3dca0ce1bf426ddebd567c65bbfe1078f163e3134d39a6847377031dcca20bdf806a038da0cbf7f85eb407460a12d4437b9087c8969bc7
+  metadata.gz: 048872d42e9256cd3a450fcfaa8b85c00191cfcb4b0570219564633621bf6493e514eee7d4d663ce4138837c14faab1508cca84a367f335bd91d33405b9a61d2
+  data.tar.gz: 16b4f1da93721f358f59418bef42edc47a68118ad91faf40a1fbfa36334df5253a555537a7a20c540f5cdfb17a55b059ba2371444760278a59fce52abfde05b6

data/.travis.yml

@@ -9,4 +9,4 @@ gemfile:
   - gemfiles/latest_stable.gemfile
   - gemfiles/oldest_current.gemfile
   - gemfiles/previous_release.gemfile
-
+  - gemfiles/windows_wip.gemfile

data/Appraisals

@@ -1,14 +1,26 @@
 appraise "latest-stable" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
+  group :plugins do
+    gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
+  end
 end
 
 # Oldest (current release)
 appraise "oldest-current" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
+  group :plugins do
+    gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
+  end
 end
 
 # Latest patch (previous release)
 appraise "previous-release" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
+  group :plugins do
+    gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
+  end
+end
+
+appraise "windows-wip" do
+  group :plugins do
+    gem "vagrant", :git => 'git://github.com/maxlinc/vagrant.git', :branch => 'winrmssl'
+  end
 end
 

data/Gemfile

@@ -1,19 +1,13 @@
 source 'https://rubygems.org'
 
-
-group :plugins do
-  gemspec
-  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant'
-end
-
-gem "appraisal", "1.0.0.beta2"
-
 group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
   gem 'coveralls', require: false
   gem 'pry'
+  # My branch contains a fix for https://github.com/thoughtbot/appraisal/issues/76
+  gem 'appraisal', '~> 1.0', git: 'https://github.com/maxlinc/appraisal', branch: 'gemspec_in_group'
 end
 
-  
+group :plugins do
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :branch => 'master'
+  gemspec
+end

data/README.md

@@ -35,11 +35,56 @@ box file for Vagrant.
 The default configuration of the RHEL family of Linux distributions requires a tty in order to run sudo.  Vagrant does not connect with a tty by default, so you may experience the error:
 > sudo: sorry, you must have a tty to run sudo
 
-The best way to deal with this error is to upgrade to Vagrant 1.4 or later, and enable:
+If you are using Vagrant 1.4 or later you can tell it to use a pty for SSH connections. However,
+RSync doesn't work very well with a pty, so you would still have trouble. The best approach is to
+use an `init_script` setting to modify the sudoers file and disable the require_tty requirement.
+
+The following settings show an example of how you can workaround the issue:
 ```ruby
-config.ssh.pty = true
+Vagrant.configure("2") do |config|
+  config.vm.box = "dummy"
+  config.ssh.pty = true
+
+  config.vm.provider :rackspace do |rs|
+    rs.username = "YOUR USERNAME"
+    rs.api_key  = "YOUR API KEY"
+    rs.flavor   = /1 GB Performance/
+    rs.image    = /^CentOS/
+    rs.init_script = 'sed -i\'.bk\' -e \'s/^\(Defaults\s\+requiretty\)/# \1/\' /etc/sudoers'
+  end
+end
 ```
 
+### Windows (enabling WinRM)
+
+Vagrant 1.6 and later support WinRM as an alternative to SSH for communicating with Windows machines. However, WinRM is not enabled by default on the Rackspace images for Windows. You can use the `init_script
+to enable and secure WinRM so Vagrant will be able to connect. This example enables WinRM for both HTTP and HTTPS traffic.
+
+Security warnings:
+- Vagrant's WinRM support is not as secure as SSH. You should only use it for testing purposes where these warnings are acceptible. If you require a more secure setup you'll need to either configure SSH on Windows, or to wait until for future Vagrant releases with better WinRM security.
+  - The current Vagrant release (v1.6.5) only supports WinRM as plaintext over HTTP, but [SSL support is in progress](https://github.com/mitchellh/vagrant/pull/4236) and should hopefully be included in the next release.
+  - The default setup, even with SSL support, uses self-signed certificates. If you want to use a real Certificate Authority you'll need to customize your Windows images or `init_script`.
+
+If you're okay with those warnings, you can create a Windows server using these settings:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = "dummy"
+  config.ssh.pty = true
+
+  config.vm.provider :rackspace do |rs|
+    rs.username = "YOUR USERNAME"
+    rs.api_key  = "YOUR API KEY"
+    rs.flavor   = /1 GB Performance/
+    rs.image    = 'Windows Server 2012'
+    rs.init_script = File.read 'bootstrap.cmd'
+  end
+end
+```
+
+You can get a sample [bootstrap.cmd](bootstrap.cmd) file from this repo.
+
+
 ## Quick Start
 
 After installing the plugin (instructions above), the quickest way to get
@@ -96,21 +141,20 @@ If you are using RackConnect with vagrant, you will need to add the following li
 The plugin includes several Rackspace-specific vagrant commands.  You can get the
 list of available commands with `vagrant rackspace -h`.
 
-If you want to know what images or flavors are available for a machine, you can use:
+For example to list all available images for a machine you can use:
 
 ```
 $ vagrant rackspace images
-$ vagrant rackspace flavors
 ```
 
 In a multi-machine Vagrantfile you can also query for a single machine:
+
 ```
 $ vagrant rackspace images <name>
-$ vagrant rackspace flavors <name>
 ```
 
-These command will connect to Rackspace using the settings associated with the machine,
-and query the region to get the list of available images or flavors.
+These commands will connect to Rackspace using the settings associated with the machine,
+and query the region to get the list of available flavors, images, keypairs, networks and servers.
 
 ## Box Format
 
@@ -134,9 +178,9 @@ This provider exposes quite a few provider-specific configuration options:
 * `image` - The server image to boot. This can be a string matching the
   exact ID or name of the image, or this can be a regular expression to
   partially match some image.
-* `rackspace_region` - The region to hit. By default this is :dfw. Valid options are: 
+* `rackspace_region` - The region to hit. By default this is :dfw. Valid options are:
 :dfw, :ord, :lon, :iad, :syd.  Users should preference using this setting over `rackspace_compute_url` setting.
-* `rackspace_compute_url` - The compute_url to hit. This is good for custom endpoints. 
+* `rackspace_compute_url` - The compute_url to hit. This is good for custom endpoints.
 * `rackspace_auth_url` - The endpoint to authentication against. By default, vagrant will use the global
 rackspace authentication endpoint for all regions with the exception of :lon. IF :lon region is specified
 vagrant will authenticate against the UK authentication endpoint.

data/Vagrantfile

@@ -4,125 +4,66 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+%w{RAX_USERNAME RAX_API_KEY VAGRANT_ADMIN_PASSWORD}.each do |var|
+  abort "Please set the environment variable #{var} in order to run the test" unless ENV.key? var
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    Vagrant.require_plugin "vagrant-rackspace"
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "dummy"
-  config.vm.provider :rackspace do |rs|
-    rs.username = ENV['RAX_USERNAME']
-    rs.admin_password = ENV['VAGRANT_ADMIN_PASSWORD']
-    rs.api_key  = ENV['RAX_API_KEY']
-    rs.flavor   = /1 GB Performance/
-    rs.image    = /Ubuntu/
-    rs.rackspace_region = :iad
 
-    # rs.rsync_include 'PATTERN'  # per man page for rsync
+  config.vm.define :ubuntu do |ubuntu|
+    ubuntu.ssh.private_key_path = '~/.ssh/id_rsa'
+    ubuntu.vm.provider :rackspace do |rs|
+      rs.username = ENV['RAX_USERNAME']
+      rs.admin_password = ENV['VAGRANT_ADMIN_PASSWORD']
+      rs.api_key  = ENV['RAX_API_KEY']
+      rs.flavor   = /1 GB Performance/
+      rs.image    = /Ubuntu/
+      rs.rackspace_region = :iad
+      rs.public_key_path = '~/.ssh/id_rsa.pub'
+    end
   end
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  # config.vm.box_url = "http://domain.com/path/to/above.box"
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network :forwarded_port, guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network :private_network, ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network :public_network
-
-  # If true, then any SSH connections made will enable agent forwarding.
-  # Default value: false
-  # config.ssh.forward_agent = true
 
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
-  #
-  # View the documentation for the provider you're using for more
-  # information on available options.
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file base.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "init.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding
-  # some recipes and/or roles.
-  #
-  # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
+  config.vm.define :centos do |centos|
+    centos.ssh.private_key_path = '~/.ssh/id_rsa'
+    centos.ssh.pty = true
+    centos.vm.provider :rackspace do |rs|
+      rs.username = ENV['RAX_USERNAME']
+      rs.admin_password = ENV['VAGRANT_ADMIN_PASSWORD']
+      rs.api_key  = ENV['RAX_API_KEY']
+      rs.flavor   = /1 GB Performance/
+      rs.image    = /^CentOS/ # Don't match OnMetal - CentOS
+      rs.rackspace_region = :iad
+      rs.public_key_path = '~/.ssh/id_rsa.pub'
+      rs.init_script = 'sed -i\'.bk\' -e \'s/^\(Defaults\s\+requiretty\)/# \1/\' /etc/sudoers'
+    end
+  end
 
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # If you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
+  config.vm.define :windows do |windows|
+    windows.vm.provision :shell, :inline => 'Write-Output "WinRM is working!"'
+    windows.vm.communicator = :winrm
+    windows.winrm.username = 'Administrator'
+    windows.winrm.password = ENV['VAGRANT_ADMIN_PASSWORD']
+    begin
+      windows.winrm.transport = :ssl
+      windows.winrm.ssl_peer_verification = false
+    rescue
+      puts "Warning: Vagrant #{Vagrant::VERSION} does not support WinRM over SSL."
+    end
+    windows.vm.synced_folder ".", "/vagrant", disabled: true
+    windows.vm.provider :rackspace do |rs|
+      rs.username = ENV['RAX_USERNAME']
+      rs.api_key  = ENV['RAX_API_KEY']
+      rs.admin_password = ENV['VAGRANT_ADMIN_PASSWORD']
+      rs.flavor   = /2 GB Performance/
+      rs.image    = 'Windows Server 2012'
+      rs.rackspace_region = ENV['RAX_REGION'] ||= 'dfw'
+      rs.init_script = File.read 'bootstrap.cmd'
+    end
+  end
 end

data/bootstrap.cmd

@@ -0,0 +1,16 @@
+Function SetupWinRM
+{
+  Param(
+    [String]$hostname,
+    [String]$thumbprint
+   )
+  netsh advfirewall firewall set rule group="remote administration" new enable=yes
+  netsh advfirewall firewall add rule name="WinRM HTTP" dir=in action=allow protocol=TCP localport=5985
+  netsh advfirewall firewall add rule name="WinRM HTTPS" dir=in action=allow protocol=TCP localport=5986
+  winrm create winrm/config/Listener?Address=*+Transport=HTTPS "@{Hostname=`"${hostname}`"; CertificateThumbprint=`"${thumbprint}`"}"
+}
+
+$hostname = $env:COMPUTERNAME
+$cert = New-SelfSignedCertificate -CertStoreLocation cert:\LocalMachine\My -DnsName $hostname
+$thumbprint = $cert.Thumbprint
+SetupWinRM -hostname $hostname -thumbprint $thumbprint

data/gemfiles/latest_stable.gemfile

@@ -2,11 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta2"
-gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.4.2"
-
 group :development do
-  gem "coveralls", :require=>false
+  gem "coveralls", :require => false
+  gem "pry"
+  gem "appraisal", "~> 1.0", :git => "https://github.com/maxlinc/appraisal", :branch => "gemspec_in_group"
 end
 
-gemspec :path=>".././"
+group :plugins do
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :branch => "v1.4.2"
+  
+  gemspec :path => "../"
+end

data/gemfiles/oldest_current.gemfile

@@ -2,11 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta2"
-gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.4.0"
-
 group :development do
-  gem "coveralls", :require=>false
+  gem "coveralls", :require => false
+  gem "pry"
+  gem "appraisal", "~> 1.0", :git => "https://github.com/maxlinc/appraisal", :branch => "gemspec_in_group"
 end
 
-gemspec :path=>".././"
+group :plugins do
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :branch => "v1.4.0"
+  
+  gemspec :path => "../"
+end

data/gemfiles/previous_release.gemfile

@@ -2,11 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "1.0.0.beta2"
-gem "vagrant", :git=>"git://github.com/mitchellh/vagrant.git", :branch=>"v1.3.5"
-
 group :development do
-  gem "coveralls", :require=>false
+  gem "coveralls", :require => false
+  gem "pry"
+  gem "appraisal", "~> 1.0", :git => "https://github.com/maxlinc/appraisal", :branch => "gemspec_in_group"
 end
 
-gemspec :path=>".././"
+group :plugins do
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :branch => "v1.3.5"
+  
+  gemspec :path => "../"
+end

data/gemfiles/windows_wip.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+group :development do
+  gem "coveralls", :require => false
+  gem "pry"
+  gem "appraisal", "~> 1.0", :git => "https://github.com/maxlinc/appraisal", :branch => "gemspec_in_group"
+end
+
+group :plugins do
+  gem "vagrant", :git => "git://github.com/maxlinc/vagrant.git", :branch => "winrmssl"
+  
+  gemspec :path => "../"
+end

data/lib/vagrant-rackspace/action.rb

@@ -12,15 +12,22 @@ module VagrantPlugins
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
+          b.use Call, IsCreated do |env, b1|
             if !env[:result]
-              b2.use MessageNotCreated
+              b1.use MessageNotCreated
               next
             end
 
-            b2.use ConnectRackspace
-            b2.use DeleteServer
-            b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+            b1.use Call, DestroyConfirm do |env1, b2|
+              if env1[:result]
+                b2.use ConnectRackspace
+                b2.use DeleteServer
+                b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+              else
+                b2.use Message, I18n.t("vagrant_rackspace.will_not_destroy")
+                next
+              end
+            end
           end
         end
       end
@@ -121,7 +128,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             created = env[:result]
-            
+
             if !created
               b2.use MessageNotCreated
               next
@@ -150,6 +157,13 @@ module VagrantPlugins
         end
       end
 
+      def self.action_list_keypairs
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConnectRackspace
+          b.use ListKeyPairs
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectRackspace, action_root.join("connect_rackspace")
@@ -164,6 +178,9 @@ module VagrantPlugins
       autoload :CreateImage, action_root.join("create_image")
       autoload :ListImages, action_root.join("list_images")
       autoload :ListFlavors, action_root.join("list_flavors")
+      autoload :ListKeyPairs, action_root.join("list_keypairs")
+      autoload :ListNetworks, action_root.join("list_networks")
+      autoload :ListServers, action_root.join("list_servers")
     end
   end
 end

data/lib/vagrant-rackspace/action/create_server.rb

@@ -16,8 +16,14 @@ module VagrantPlugins
         end
 
         def call(env)
-          # Get the configs
-          config   = env[:machine].provider_config
+          # Get the Rackspace configs
+          config           = env[:machine].provider_config
+          machine_config   = env[:machine].config
+          begin
+            communicator = machine_config.vm.communicator ||= :ssh
+          rescue NoMethodError
+            communicator = :ssh
+          end
 
           # Find the flavor
           env[:ui].info(I18n.t("vagrant_rackspace.finding_flavor"))
@@ -32,14 +38,19 @@ module VagrantPlugins
           # Figure out the name for the server
           server_name = config.server_name || env[:machine].name
 
-          # If we are using a key name, can ignore the public key path
-          if not config.key_name
-            # If we're using the default keypair, then show a warning
-            default_key_path = Vagrant.source_root.join("keys/vagrant.pub").to_s
-            public_key_path  = File.expand_path(config.public_key_path, env[:root_path])
-
-            if default_key_path == public_key_path
-              env[:ui].warn(I18n.t("vagrant_rackspace.warn_insecure_ssh"))
+          if communicator == :winrm
+            env[:ui].warn(I18n.t("vagrant_rackspace.warn_insecure_winrm")) if !winrm_secure?(machine_config)
+            env[:ui].warn(I18n.t("vagrant_rackspace.warn_winrm_password")) if config.admin_password != machine_config.winrm.password
+          else # communicator == :ssh
+            # If we are using a key name, can ignore the public key path
+            if not config.key_name
+              # If we're using the default keypair, then show a warning
+              default_key_path = Vagrant.source_root.join("keys/vagrant.pub").to_s
+              public_key_path  = File.expand_path(config.public_key_path, env[:root_path])
+
+              if default_key_path == public_key_path
+                env[:ui].warn(I18n.t("vagrant_rackspace.warn_insecure_ssh"))
+              end
             end
           end
 
@@ -71,14 +82,26 @@ module VagrantPlugins
             options[:config_drive] = config.config_drive
           end
 
-          if config.key_name
-            options[:key_name] = config.key_name
-            env[:ui].info(" -- Key Name: #{config.key_name}")
-          else
+          if communicator == :ssh
+            if config.key_name
+              options[:key_name] = config.key_name
+              env[:ui].info(" -- Key Name: #{config.key_name}")
+            else
+              options[:personality] = [
+                {
+                  :path     => "/root/.ssh/authorized_keys",
+                  :contents => encode64(File.read(public_key_path))
+                }
+              ]
+            end
+          end
+
+          if config.init_script && communicator == :winrm
+            # Might want to check init_script against known limits
             options[:personality] = [
               {
-                :path     => "/root/.ssh/authorized_keys",
-                :contents => Base64.encode64(File.read(public_key_path))
+                :path     => 'C:\\cloud-automation\\bootstrap.cmd',
+                :contents => encode64(config.init_script, :crlf_newline => true)
               }
             ]
           end
@@ -99,8 +122,7 @@ module VagrantPlugins
             next if env[:interrupted]
 
             # Set the progress
-            env[:ui].clear_line
-            env[:ui].report_progress(server.progress, 100, false)
+            report_server_progress(env[:machine], server.progress, 100, false)
 
             # Wait for the server to be ready
             begin
@@ -131,8 +153,10 @@ module VagrantPlugins
               end
             end
 
-            # Wait for SSH to become available
-            env[:ui].info(I18n.t("vagrant_rackspace.waiting_for_ssh"))
+            # Wait for a communicator
+            env[:ui].info(I18n.t("vagrant_rackspace.waiting_for_communicator",
+              :communicator => communicator, :address => server.public_ip_address))
+
             while true
               # If we're interrupted then just back out
               break if env[:interrupted]
@@ -143,6 +167,7 @@ module VagrantPlugins
             env[:ui].info(I18n.t("vagrant_rackspace.ready"))
           end
 
+          env[:machine].communicate.sudo config.init_script if config.init_script && communicator == :ssh
           @app.call(env)
         end
 
@@ -174,7 +199,32 @@ module VagrantPlugins
           item
         end
 
+        def encode64(content, options = nil)
+          content = content.encode options if options
+          encoded = Base64.encode64 content
+          encoded.strip
+        end
+
+        # This method checks to see if WinRM over SSL is supported and used
+        def winrm_secure?(machine_config)
+          machine_config.winrm.transport == :ssl
+        rescue NoMethodError
+          false
+        end
+
+        # Ported from Vagrant::UI, but scoped to the machine's UI
+        def report_server_progress(machine, progress, total, show_parts)
+          machine.ui.clear_line
+          if total && total > 0
+            percent = (progress.to_f / total.to_f) * 100
+            line    = "Progress: #{percent.to_i}%"
+            line   << " (#{progress} / #{total})" if show_parts
+          else
+            line    = "Progress: #{progress}"
+          end
 
+          machine.ui.info(line, new_line: false)
+        end
       end
     end
   end

data/lib/vagrant-rackspace/action/list_keypairs.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Rackspace
+    module Action
+      class ListKeyPairs
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          compute_service = env[:rackspace_compute]
+          env[:ui].info ('%s' % ['KeyPair Name'])
+          compute_service.key_pairs.sort_by(&:name).each do |keypair|
+            env[:ui].info ('%s' % [keypair.name])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/action/list_networks.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Rackspace
+    module Action
+      class ListNetworks
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          compute_service = env[:rackspace_compute]
+          env[:ui].info ('%-36s %-24s %s' % ['Network Name', 'Network CIDR', 'Network ID'])
+          compute_service.networks.sort_by(&:label).each do |network|
+            env[:ui].info ('%-36s %-24s %s' % [network.label, network.cidr, network.id])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/action/list_servers.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Rackspace
+    module Action
+      class ListServers
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          compute_service = env[:rackspace_compute]
+          env[:ui].info ('%-20s %-20s %s' % ['Server Name', 'State', 'IPv4 address'])
+          compute_service.servers.sort_by(&:name).each do |server|
+            env[:ui].info ('%-20s %-20s %s' % [server.name, server.state, server.access_ipv4_address])
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/keypairs.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class KeyPairs < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace keypairs [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('list_keypairs')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/networks.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class Networks < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace networks [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('list_networks')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/command/root.rb

@@ -20,6 +20,18 @@ module VagrantPlugins
             require File.expand_path("../flavors", __FILE__)
             Flavors
           end
+          @subcommands.register(:keypairs) do
+            require File.expand_path("../keypairs", __FILE__)
+            KeyPairs
+          end
+          @subcommands.register(:networks) do
+            require File.expand_path("../networks", __FILE__)
+            Networks
+          end
+          @subcommands.register(:servers) do
+            require File.expand_path("../servers", __FILE__)
+            Servers
+          end
 
           super(argv, env)
         end

data/lib/vagrant-rackspace/command/servers.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Rackspace
+    module Command
+      class Servers < Vagrant.plugin("2", :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rackspace servers [options]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv, :provider => :rackspace) do |machine|
+            machine.action('list_servers')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rackspace/config.rb

@@ -119,6 +119,17 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :admin_password
 
+      # A initialization script to run on the target machine before
+      # Vagrant connects. It should generally be used only for enabling
+      # or securing shell connection transport protocols, like SSH or WinRM.
+      # Use normal Vagrant provisioners for other purposes.
+      #
+      # This script may be subject to the limits for Server Personality.
+      #
+      # @return [String]
+      # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Personality-d1e2543.html Server Personality
+      attr_accessor :init_script
+
       # Default Rackspace Cloud Network IDs
       SERVICE_NET_ID = '11111111-1111-1111-1111-111111111111'
       PUBLIC_NET_ID = '00000000-0000-0000-0000-000000000000'
@@ -139,6 +150,7 @@ module VagrantPlugins
         @disk_config = UNSET_VALUE
         @networks = []
         @rsync_includes = []
+        @init_script = UNSET_VALUE
       end
 
       def finalize!
@@ -157,6 +169,7 @@ module VagrantPlugins
         @disk_config = nil if @disk_config == UNSET_VALUE
         @networks = nil if @networks.empty?
         @rsync_includes = nil if @rsync_includes.empty?
+        @init_script = nil if @init_script == UNSET_VALUE
 
         if @public_key_path == UNSET_VALUE
           @public_key_path = Vagrant.source_root.join("keys/vagrant.pub")

data/lib/vagrant-rackspace/plugin.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:rackspace) do
+      provider(:rackspace, { :box_optional => true, parallel: true}) do
         # Setup some things
         Rackspace.init_i18n
         Rackspace.init_logging

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

data/locales/en.yml

@@ -24,21 +24,32 @@ en:
       Waiting for the server to be built...
     waiting_for_rackconnect: |-
       Waiting for RackConnect to complete...
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
+    waiting_for_communicator: |-
+      Waiting for %{communicator} to become available at %{address}...
     warn_insecure_ssh: |-
       Warning! By not specifying a custom public/private keypair,
       Vagrant is defaulting to use the insecure keypair that ships with
       Vagrant. While this isn't much of a big deal for local development,
       this is quite insecure for remote servers. Please specify a custom
       public/private keypair.
+    warn_insecure_winrm: |-
+      Warning! Vagrant is using plaintext communication for WinRM. While
+      this isn't much of a big deal for local development, this is quite
+      insecure for remote servers. Please configure WinRM to use SSL.
+    warn_winrm_password: |-
+      Warning! Vagrant has no way to store the Administrator password generated
+      by Rackspace for later use with WinRM. Please configure Vagrant to use
+      the same value for the winrm password and the Rackspace admin_password so
+      Vagrant will be able to connect via WinRM.
     warn_networks: |-
       Warning! The Rackspace provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They
       will be silently ignored.
+    will_not_destroy: |-
+      The server will not be deleted.
     sync_folders: |-
         Rackspace support for Vagrant 1.3 has been deprecated. Please
-        upgrade to the latest version of vagrant for continued support. 
+        upgrade to the latest version of vagrant for continued support.
 
     config:
       api_key_required: |-

data/spec/vagrant-rackspace/config_spec.rb

@@ -25,6 +25,7 @@ describe VagrantPlugins::Rackspace::Config do
     its(:networks) { should be_nil }
     its(:rsync_includes) { should be_nil }
     its(:admin_password)  { should be_nil }
+    its(:init_script)  { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -39,7 +40,8 @@ describe VagrantPlugins::Rackspace::Config do
       :server_name,
       :disk_config,
       :username,
-      :admin_password].each do |attribute|
+      :admin_password,
+      :init_script].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
         subject.finalize!
@@ -56,7 +58,7 @@ describe VagrantPlugins::Rackspace::Config do
       subject.send(:networks).should include(VagrantPlugins::Rackspace::Config::SERVICE_NET_ID)
     end
 
-    it "should not default rsync_includes if overridden" do 
+    it "should not default rsync_includes if overridden" do
       inc = "core"
       subject.send(:rsync_include, inc)
       subject.finalize!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -84,6 +84,7 @@ files:
 - Rakefile
 - Vagrantfile
 - Vagrantfile.multi
+- bootstrap.cmd
 - dummy.box
 - example_box/README.md
 - example_box/metadata.json
@@ -96,6 +97,7 @@ files:
 - gemfiles/latest_stable.gemfile
 - gemfiles/oldest_current.gemfile
 - gemfiles/previous_release.gemfile
+- gemfiles/windows_wip.gemfile
 - lib/vagrant-rackspace.rb
 - lib/vagrant-rackspace/action.rb
 - lib/vagrant-rackspace/action/connect_rackspace.rb
@@ -105,6 +107,9 @@ files:
 - lib/vagrant-rackspace/action/is_created.rb
 - lib/vagrant-rackspace/action/list_flavors.rb
 - lib/vagrant-rackspace/action/list_images.rb
+- lib/vagrant-rackspace/action/list_keypairs.rb
+- lib/vagrant-rackspace/action/list_networks.rb
+- lib/vagrant-rackspace/action/list_servers.rb
 - lib/vagrant-rackspace/action/message_already_created.rb
 - lib/vagrant-rackspace/action/message_not_created.rb
 - lib/vagrant-rackspace/action/read_ssh_info.rb
@@ -113,8 +118,11 @@ files:
 - lib/vagrant-rackspace/command/create_image.rb
 - lib/vagrant-rackspace/command/flavors.rb
 - lib/vagrant-rackspace/command/images.rb
+- lib/vagrant-rackspace/command/keypairs.rb
 - lib/vagrant-rackspace/command/list_images.rb
+- lib/vagrant-rackspace/command/networks.rb
 - lib/vagrant-rackspace/command/root.rb
+- lib/vagrant-rackspace/command/servers.rb
 - lib/vagrant-rackspace/config.rb
 - lib/vagrant-rackspace/errors.rb
 - lib/vagrant-rackspace/plugin.rb