vagrant-azure 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aee9b5f481d71e24f031aeebf3b3c839fc9e1f6
-  data.tar.gz: 1ed64f270bddda3ef6ac26d9db8c700224c4ccca
+  metadata.gz: 885a96873ff590a63735e07f52d4fbd602055b06
+  data.tar.gz: 65557e9414515c416956099c4145f073cab3afb4
 SHA512:
-  metadata.gz: feb568430aa70d4c59ab756d68b1a2b9c6e8a770269867f3b4a4bc3beb163eff604a4bb454e52e7485e50b9cb452ea530d00f04390b59d0f3632d405ef4fa093
-  data.tar.gz: 813c3493741560bb981ba4fd87454b299eb3c5496fd9b24e43d487affb297cb24cd9a04cd0a3345a340f7eb090f1dec244175297de80ebab34601fd6d127bb0f
+  metadata.gz: 2dc3dac70cd18050d7ab10382b0645fe6614b9e3d27b7965c55ff2b3c3fa7f81ed89d39c2801d83908df9fa9e18519cec7e6e7070d78fe972ceeceb5606b6674
+  data.tar.gz: a5163475ec6352837905e1504cb92afc8a81a98c4d1c8a23fdfd9e379fc2811b08d7230198fdef21c90fe0c0f9bbfee04ae95aaa77306a6f242974a9f7861bd9

data/.gitignore

@@ -4,6 +4,7 @@ Gemfile.lock
 azure.box
 Vagrantfile
 !example_box/Vagrantfile
+!example_box/README.md
 babu
 example_box/
 *.rdp
@@ -11,3 +12,4 @@ pkg/
 gem/
 manifests/
 modules/
+.vagrant/

data/README.md

@@ -1,9 +1,124 @@
 # Vagrant Azure Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds [Windows Azure](https://www.windowsazure.com)
+![Gem Version](https://badge.fury.io/rb/vagrant-azure.png)
+
+This is a [Vagrant](http://www.vagrantup.com) 1.5.2+ plugin that adds [Windows Azure](https://www.windowsazure.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in
 Windows Azure.
 
-**NOTE:** This plugin requires Vagrant 1.2+,
+**NOTE:** This plugin requires Vagrant 1.5.2+,
+
+## Usage
+
+Install Vagrant 1.5.2 or higher - [Download Vagrant](http://www.vagrantup.com/downloads.html)
+
+Install the vagrant-azure plugin using the standarn Vagrant 1.1+ installation methods. After installing the plugin, you can you can ```vagrant up``` and use ```azure``` provider. For example:
+
+```
+C:\> vagrant plugin install vagrant-azure
+...
+C:\> vagrant up --provider=azure
+...
+```
+
+You'll need an ```azure``` box before you can do ```vagrant up``` though.
+
+## Quick Start
+
+You can use the dummy box and specify all the required details manually in the ```confiv.vm.provider``` block in your ```Vagrantfile```. Add the dummy box with the name you want:
+
+```
+C:\> vagrant box add azure https://github.com/msopentech/vagrant-azure/raw/master/dummy.box
+...
+```
+
+Now edit your ```Vagrantfile``` as shown below and provide all the values as explained.
+
+```ruby
+Vagrant.configure('2') do |config|
+	config.vm.box = 'azure'
+
+	config.vm.provider :azure do |azure|
+		azure.mgmt_certificate = 'YOUR AZURE MANAGEMENT CERTIFICATE'
+		azure.mgmt_endpoint = 'https://management.core.windows.net'
+		azure.subscription_id = 'YOUR AZURE SUBSCRIPTION ID'
+		auzre.storage_acct_name = 'NAME OF YOUR STORAGE ACCOUNT' # optional. A new one will be generated if not provided.
+
+		azure.vm_user = 'PROVIDE A USERNAME' # defaults to 'vagrant' if not provided
+		azure.vm_password = 'PROVIDE A VALID PASSWORD' # min 8 characters. should contain a lower case letter, an uppercase letter, a number and a special character
+
+		azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE' # max 15 characters. contains letters, number and hyphens. can start with letters and can end with letters and numbers
+		azure.cloud_service_name = 'PROVIDE A NAME FOR YOUR CLOUD SERVICE' # same as vm_name. leave blank to auto-generate
+		azure.deployment_name = 'PROVIDE A NAME FOR YOUR DEPLOYMENT' # defaults to cloud_service_name
+		azure.vm_location = 'PROVIDE A LOCATION FOR VM' # e.g., West US
+	    azure.ssh_private_key_file = 'PATH TO YOUR KEY FILE'
+	    azure.ssh_certificate_file = 'PATH TO YOUR CERTIFICATE FILE'
+
+	    # Provide the following values if creating a *Nix VM
+	    azure.ssh_port = 'A VALID PUBLIC PORT'
+
+	    # Provide the following values if creating a Windows VM
+	    azure.winrm_transport = [ 'http', 'https' ] # this will open up winrm ports on both http (5985) and http (5986) ports
+	    azure.winrm_https_port = 'A VALID PUBLIC PORT' # customize the winrm https port, instead of 5986
+	    azure.winrm_http_port = 'A VALID PUBLIC PORT' # customize the winrm http port, insted of 5985
+
+	    azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
+	end
+
+	config.ssh.username = 'YOUR USERNAME' # the one used to create the VM
+	config.ssh.password = 'YOUR PASSOWRD' # the one used to create the VM
+end
+```
+
+Now you can run
+
+```
+C:\> vagrant up --provider=azure
+```
+
+This will bring up an Azure VM as per the configuration options set above.
+
+You can now either SSH (if its a *Nix VM) using ```vagrant ssh```, or RDP (if its a Windows VM) using ```vagrant rdp```.
+
+Normally, a lot of this options, e.g., ```vm_image```, will be embedded in a box file and you just have to provide minimal options in the ```Vagrantfile```. Since, we're using a dummy box, there are no pre-configured defaults.
+
+## Azure Boxes
+
+The vagrant-azure plugin provides the ability to use ```azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/msopentech/vagrant-azure/tree/master/example_box) and follow the instructions there to build an ```azure``` box.
+
+Please see [Vagrant Docs](http://docs.vagrantup.com/v2/) for more details.
 
 ## Configuration
+
+The vagrant-azure provide exposes a few Azure specific configration options:
+
+* `mgmt_certificate` - Your Azure Management certificate which has been uploaded to the Azure portal for your account.
+* `mgmt_endpoint` - Azure Management endpoint. `https://management.core.windows.net`
+* `subscription_id` - Your Azure Subscription ID.
+* `storage_acct_name` - The Storage account to use when creating VMs.
+* `vm_user` - The username to create the VM with. Defaults to `vagrant`.
+* `vm_password`- The password to set for the user created with the VM.
+* `vm_name` - The name of the created VM.
+* `vm_size` - The size of the created VM.
+* `cloud_service_name` - The name of the cloud service under which to create the VM.
+* `deployment_name` - The name to give the deployment in the cloud service and add the VM to.
+* `vm_location` - The location to create the cloud service, storage account.
+* `ssh_private_key_file` - The private key file to use for SSH and if WinRM is enabled over HTTP/S.
+* `ssh_certificate_file` - The certificate file to use for SSH and if WinRM is enabled over HTTP/S.
+* `ssh_port` - To map the internal SSH port 22 to a different public port.
+* `winrm_transport` - Enables or disables WinRm. Allowed values are `http` and `https`.
+* `winrm_https_port` To map the internal WinRM https port 5986 to a different public port.
+* `winrm_http_port` To map the internal WinRM http port 5985 to a different public port.
+* `tcp_endpoints` - To open any additional ports. E.g., `80` opens port `80` and `80,3389:53389` opens port `80` and `3389`. Also maps the interal port `3389` to public port `53389`
+* 
+
+## New Commands for `azure` provider
+
+The `azure` provider introduces the following new `vagrant` commands.
+
+* `rdp` - To connect to a Windows VM using RDP. E.g.,
+```
+C:\> vagrant up --provider=azure
+...
+C:\> vagrant rdp
+```

data/lib/vagrant-azure.rb

@@ -13,6 +13,8 @@ module VagrantPlugins
     autoload :Driver, lib_path.join('driver')
 
     require lib_path.join('provisioner/puppet')
+    require lib_path.join('provisioner/chef-solo')
+    require lib_path.join('provisioner/shell')
 
     # This returns the path to the source of this plugin.
     #

data/lib/vagrant-azure/action.rb

@@ -215,13 +215,14 @@ module VagrantPlugins
               next
             end
 
-            b2.use RestartVM
-            b2.use Call, WaitForState, :ReadyRole do |env2, b3|
+            b2.use action_halt
+            b2.use Call, WaitForState, :StoppedDeallocated do |env2, b3|
               if env2[:result]
                 env2[:machine].id =~ /@/
-                b3.use Message, I18n.t(
-                  'vagrant_azure.vm_started', :name => $`
-                )
+                b3.use Message, I18n.t('vagrant_azure.vm_stopped', name: $`)
+                b3.use action_up
+              else
+                b3.use Message, 'Not able to stop the machine. Please retry.'
               end
             end
           end

data/lib/vagrant-azure/action/provision.rb

@@ -1,40 +1,49 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#---------------------------------------------------------------------------
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class Provision < Vagrant::Action::Builtin::Provision
-        # Override the core vagrant method and branch out for windows
-        def run_provisioner(env)
-          env[:ui].info "Provisioner: #{env[:provisioner].class.to_s}"
-
-          env[:machine].id =~ /@/
-          vm = env[:azure_vm_service].get_virtual_machine($`, $')
-          env[:ui].info "VM OS: #{vm.os_type.to_sym}"
-
-          if vm.os_type.to_sym == :Windows
-            # Raise an error if we're not on a Windows Host.
-            # Non-Windows OS will be supported once we move to WinRb/WinRm
-            env[:ui].info "Is Host OS Windows?: #{Vagrant::Util::Platform.windows?}"
-            raise 'Unsupported OS for Windows Provisioning' unless \
-              Vagrant::Util::Platform.windows?
-            env[:ui].info "Provisioning for Windows"
-
-            # TODO: Add Shell, Chef-solo and other provisioners
-            case env[:provisioner].class.to_s
-            when "VagrantPlugins::Puppet::Provisioner::Puppet"
-              VagrantPlugins::WinAzure::Provisioner::Puppet.new(
-                env
-              ).provision_for_windows
-            end
-          else
-            env[:ui].info "Provisioning using SSH"
-            env[:provisioner].provision
-          end
-        end
-      end
-    end
-  end
-end
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#---------------------------------------------------------------------------
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class Provision < Vagrant::Action::Builtin::Provision
+        # Override the core vagrant method and branch out for windows
+        def run_provisioner(env)
+          env[:ui].info "Provisioner: #{env[:provisioner].class.to_s}"
+
+          env[:machine].id =~ /@/
+          vm = env[:azure_vm_service].get_virtual_machine($`, $')
+          env[:ui].info "VM OS: #{vm.os_type.to_sym}"
+
+          if vm.os_type.to_sym == :Windows
+            # Raise an error if we're not on a Windows Host.
+            # Non-Windows OS will be supported once we move to WinRb/WinRm
+            env[:ui].info "Is Host OS Windows?: #{Vagrant::Util::Platform.windows?}"
+            raise 'Unsupported OS for Windows Provisioning' unless \
+              Vagrant::Util::Platform.windows?
+            env[:ui].info "Provisioning for Windows"
+
+            # TODO: Add Shell, Chef-solo and other provisioners
+            case env[:provisioner].class.to_s
+            when "VagrantPlugins::Shell::Provisioner"
+              VagrantPlugins::WinAzure::Provisioner::Shell.new(
+                env
+              ).provision_for_windows
+            when "VagrantPlugins::Puppet::Provisioner::Puppet"
+              VagrantPlugins::WinAzure::Provisioner::Puppet.new(
+                env
+              ).provision_for_windows
+            when "VagrantPlugins::Chef::Provisioner::ChefSolo"
+              VagrantPlugins::WinAzure::Provisioner::ChefSolo.new(
+                env
+              ).provision_for_windows
+            end
+          else
+            env[:ui].info "Provisioning using SSH"
+            env[:provisioner].provision
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/run_instance.rb

@@ -1,111 +1,111 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'json'
-require 'azure'
-
-require 'vagrant/util/retryable'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class RunInstance
-        include Vagrant::Util::Retryable
-
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::run_instance')
-        end
-
-        def call(env)
-          config = env[:machine].provider_config
-
-          # Add the mandatory parameters and options
-          params = {
-            vm_name: config.vm_name,
-            vm_user: config.vm_user,
-            image: config.vm_image
-          }
-
-          options = {
-            cloud_service_name: config.cloud_service_name
-          }
-
-
-          # Add the optional parameters and options if not nil
-          params[:password] = config.vm_password unless config.vm_password.nil?
-          params[:location] = config.vm_location unless config.vm_location.nil?
-          params[:affinity_group] = config.vm_affinity_group unless \
-            config.vm_affinity_group.nil?
-
-          options[:storage_account_name] = config.storage_acct_name unless \
-            config.storage_acct_name.nil?
-          options[:deployment_name] = config.deployment_name unless \
-            config.deployment_name.nil?
-          options[:tcp_endpoints] = config.tcp_endpoints unless \
-            config.tcp_endpoints.nil?
-          options[:private_key_file] = config.ssh_private_key_file unless \
-            config.ssh_private_key_file.nil?
-          options[:certificate_file] = config.ssh_certificate_file unless \
-            config.ssh_certificate_file.nil?
-          options[:ssh_port] = config.ssh_port unless \
-            config.ssh_port.nil?
-          options[:vm_size] = config.vm_size unless \
-            config.vm_size.nil?
-          options[:winrm_transport] = config.winrm_transport unless \
-            config.winrm_transport.nil?
-          options[:winrm_http_port] = config.winrm_http_port unless \
-            config.winrm_http_port.nil?
-          options[:winrm_https_port] = config.winrm_https_port unless \
-            config.winrm_https_port.nil?
-          options[:availability_set_name] = config.availability_set_name unless \
-            config.availability_set_name.nil?
-
-          add_role = false
-
-          env[:ui].info(params.inspect)
-          env[:ui].info(options.inspect)
-
-          # Check if the cloud service exists and if yes, does it contain
-          # a deployment.
-          if config.cloud_service_name && !config.cloud_service_name.empty?
-            begin
-              cloud_service = ManagementHttpRequest.new(
-                :get,
-                "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
-              ).call
-
-              deployments = cloud_service.css 'HostedService Deployments Deployment'
-
-              # Lets see if any deployments exist. Set add_role = true if yes.
-              # We're not worried about deployment slots, because the SDK has
-              # hard coded 'Production' as deployment slot and you can have only
-              # one deployment per deployment slot.
-              add_role = deployments.length == 1
-            rescue Exception => e
-              add_role = false
-            end
-          end
-          env[:ui].info("Add Role? - #{add_role}")
-
-          server = env[:azure_vm_service].create_virtual_machine(
-            params, options, add_role
-          )
-
-          # TODO: Exception/Error Handling
-
-          if server.instance_of? String
-            env[:ui].info "Server not created. Error is: #{server}"
-            raise "#{server}"
-          end
-
-          env[:machine].id = "#{server.vm_name}@#{server.cloud_service_name}"
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'json'
+require 'azure'
+
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class RunInstance
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::run_instance')
+        end
+
+        def call(env)
+          config = env[:machine].provider_config
+
+          # Add the mandatory parameters and options
+          params = {
+            vm_name: config.vm_name,
+            vm_user: config.vm_user,
+            image: config.vm_image
+          }
+
+          options = {
+            cloud_service_name: config.cloud_service_name
+          }
+
+
+          # Add the optional parameters and options if not nil
+          params[:password] = config.vm_password unless config.vm_password.nil?
+          params[:location] = config.vm_location unless config.vm_location.nil?
+          params[:affinity_group] = config.vm_affinity_group unless \
+            config.vm_affinity_group.nil?
+
+          options[:storage_account_name] = config.storage_acct_name unless \
+            config.storage_acct_name.nil?
+          options[:deployment_name] = config.deployment_name unless \
+            config.deployment_name.nil?
+          options[:tcp_endpoints] = config.tcp_endpoints unless \
+            config.tcp_endpoints.nil?
+          options[:private_key_file] = config.ssh_private_key_file unless \
+            config.ssh_private_key_file.nil?
+          options[:certificate_file] = config.ssh_certificate_file unless \
+            config.ssh_certificate_file.nil?
+          options[:ssh_port] = config.ssh_port unless \
+            config.ssh_port.nil?
+          options[:vm_size] = config.vm_size unless \
+            config.vm_size.nil?
+          options[:winrm_transport] = config.winrm_transport unless \
+            config.winrm_transport.nil?
+          options[:winrm_http_port] = config.winrm_http_port unless \
+            config.winrm_http_port.nil?
+          options[:winrm_https_port] = config.winrm_https_port unless \
+            config.winrm_https_port.nil?
+          options[:availability_set_name] = config.availability_set_name unless \
+            config.availability_set_name.nil?
+
+          add_role = false
+
+          env[:ui].info(params.inspect)
+          env[:ui].info(options.inspect)
+
+          # Check if the cloud service exists and if yes, does it contain
+          # a deployment.
+          if config.cloud_service_name && !config.cloud_service_name.empty?
+            begin
+              cloud_service = ManagementHttpRequest.new(
+                :get,
+                "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
+              ).call
+
+              deployments = cloud_service.css 'HostedService Deployments Deployment'
+
+              # Lets see if any deployments exist. Set add_role = true if yes.
+              # We're not worried about deployment slots, because the SDK has
+              # hard coded 'Production' as deployment slot and you can have only
+              # one deployment per deployment slot.
+              add_role = deployments.length == 1
+            rescue Exception => e
+              add_role = false
+            end
+          end
+          env[:ui].info("Add Role? - #{add_role}")
+
+          server = env[:azure_vm_service].create_virtual_machine(
+            params, options, add_role
+          )
+
+          # TODO: Exception/Error Handling
+
+          if server.instance_of? String
+            env[:ui].info "Server not created. Error is: #{server}"
+            raise "#{server}"
+          end
+
+          env[:machine].id = "#{server.vm_name}@#{server.cloud_service_name}"
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end