vagrant-azure 1.0.3 → 1.0.4

data/lib/vagrant-azure/config.rb

@@ -1,147 +1,147 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'vagrant'
-require 'azure'
-
-module VagrantPlugins
-  module WinAzure
-    class Config < Vagrant.plugin('2', :config)
-      attr_accessor :mgmt_certificate
-      attr_accessor :mgmt_endpoint
-      attr_accessor :subscription_id
-      attr_accessor :storage_acct_name
-      attr_accessor :storage_access_key
-
-      attr_accessor :vm_name
-      attr_accessor :vm_user
-      attr_accessor :vm_password
-      attr_accessor :vm_image
-      attr_accessor :vm_location
-      attr_accessor :vm_affinity_group
-
-      attr_accessor :cloud_service_name
-      attr_accessor :deployment_name
-      attr_accessor :tcp_endpoints
-      attr_accessor :ssh_private_key_file
-      attr_accessor :ssh_certificate_file
-      attr_accessor :ssh_port
-      attr_accessor :vm_size
-      attr_accessor :winrm_transport
-      attr_accessor :winrm_http_port
-      attr_accessor :winrm_https_port
-      attr_accessor :availability_set_name
-
-      attr_accessor :state_read_timeout
-
-      def initialize
-        @storage_acct_name = UNSET_VALUE
-        @storage_access_key = UNSET_VALUE
-        @mgmt_certificate = UNSET_VALUE
-        @mgmt_endpoint = UNSET_VALUE
-        @subscription_id = UNSET_VALUE
-
-        @vm_name = UNSET_VALUE
-        @vm_user = UNSET_VALUE
-        @vm_password = UNSET_VALUE
-        @vm_image = UNSET_VALUE
-        @vm_location = UNSET_VALUE
-        @vm_affinity_group = UNSET_VALUE
-
-        @cloud_service_name = UNSET_VALUE
-        @deployment_name = UNSET_VALUE
-        @tcp_endpoints = UNSET_VALUE
-        @ssh_private_key_file = UNSET_VALUE
-        @ssh_certificate_file = UNSET_VALUE
-        @ssh_port = UNSET_VALUE
-        @vm_size = UNSET_VALUE
-        @winrm_transport = UNSET_VALUE
-        @winrm_http_port = UNSET_VALUE
-        @winrm_https_port = UNSET_VALUE
-        @availability_set_name = UNSET_VALUE
-        @state_read_timeout = UNSET_VALUE
-      end
-
-      def finalize!
-        @storage_acct_name = ENV["AZURE_STORAGE_ACCOUNT"] if \
-          @storage_acct_name == UNSET_VALUE
-        @storage_access_key = ENV["AZURE_STORAGE_ACCESS_KEY"] if \
-          @storage_access_key == UNSET_VALUE
-        @mgmt_certificate = ENV["AZURE_MANAGEMENT_CERTIFICATE"] if \
-          @mgmt_certificate == UNSET_VALUE
-        @mgmt_endpoint = ENV["AZURE_MANAGEMENT_ENDPOINT"] if \
-          @mgmt_endpoint == UNSET_VALUE
-        @subscription_id = ENV["AZURE_SUBSCRIPTION_ID"] if \
-          @subscription_id == UNSET_VALUE
-
-        @vm_name = nil if @vm_name == UNSET_VALUE
-        @vm_user = 'vagrant' if @vm_user == UNSET_VALUE
-        @vm_password = nil if @vm_password == UNSET_VALUE
-        @vm_image = nil if @vm_image == UNSET_VALUE
-        @vm_location = nil if @vm_location == UNSET_VALUE
-        @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
-
-        @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
-        @deployment_name = nil if @deployment_name == UNSET_VALUE
-        @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
-        @ssh_private_key_file = nil if @ssh_private_key_file == UNSET_VALUE
-        @ssh_certificate_file = nil if @ssh_certificate_file == UNSET_VALUE
-        @ssh_port = nil if @ssh_port == UNSET_VALUE
-        @vm_size = nil if @vm_size == UNSET_VALUE
-        @winrm_transport = nil if @winrm_transport == UNSET_VALUE
-        @winrm_http_port = nil if @winrm_http_port == UNSET_VALUE
-        @winrm_https_port = nil if @winrm_https_port == UNSET_VALUE
-        @availability_set_name = nil if @availability_set_name == UNSET_VALUE
-
-        @state_read_timeout = 360 if @state_read_timeout == UNSET_VALUE
-
-        # This done due to a bug in Ruby SDK - it doesn't generate a storage 
-        # account name if add_role = true
-        if @storage_acct_name.nil? || @storage_acct_name.empty?
-          @storage_acct_name = Azure::Core::Utility.random_string(
-            "#{@vm_name}storage"
-          ).gsub(/[^0-9a-z ]/i, '').downcase[0..23]
-        end
-
-        if @cloud_service_name.nil? || @cloud_service_name.empty?
-          @cloud_service_name = Azure::Core::Utility.random_string(
-            "#{@vm_name}-service-"
-          )
-        end
-      end
-
-      def merge(other)
-        super.tap do |result|
-          result.mgmt_certificate = other.mgmt_certificate || \
-            self.mgmt_certificate
-          result.mgmt_endpoint = other.mgmt_endpoint || \
-            self.mgmt_endpoint
-          result.subscription_id = other.subscription_id || \
-            self.subscription_id
-          result.storage_account_name = other.storage_acct_name || \
-            self.storage_acct_name
-          result.storage_access_key = other.storage_access_key || \
-            self.storage_access_key
-        end
-      end
-
-      def validate(machine)
-        errors = _detected_errors
-
-        # Azure connection properties related validation.
-        errors << "vagrant_azure.subscription_id.required" if \
-          @subscription_id.nil?
-        errors << "vagrant_azure.mgmt_certificate.required" if \
-          @mgmt_certificate.nil?
-        errors << "vagrant_azure.mgmt_endpoint.required" if \
-          @mgmt_endpoint.nil?
-
-        # Azure Virtual Machine related validation
-        errors << "vagrant_azure.vm_name.required" if @vm_name.nil?
-
-        { "Windows Azure Provider" => errors }
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#--------------------------------------------------------------------------
+require 'vagrant'
+require 'azure'
+
+module VagrantPlugins
+  module WinAzure
+    class Config < Vagrant.plugin('2', :config)
+      attr_accessor :mgmt_certificate
+      attr_accessor :mgmt_endpoint
+      attr_accessor :subscription_id
+      attr_accessor :storage_acct_name
+      attr_accessor :storage_access_key
+
+      attr_accessor :vm_name
+      attr_accessor :vm_user
+      attr_accessor :vm_password
+      attr_accessor :vm_image
+      attr_accessor :vm_location
+      attr_accessor :vm_affinity_group
+
+      attr_accessor :cloud_service_name
+      attr_accessor :deployment_name
+      attr_accessor :tcp_endpoints
+      attr_accessor :ssh_private_key_file
+      attr_accessor :ssh_certificate_file
+      attr_accessor :ssh_port
+      attr_accessor :vm_size
+      attr_accessor :winrm_transport
+      attr_accessor :winrm_http_port
+      attr_accessor :winrm_https_port
+      attr_accessor :availability_set_name
+
+      attr_accessor :state_read_timeout
+
+      def initialize
+        @storage_acct_name = UNSET_VALUE
+        @storage_access_key = UNSET_VALUE
+        @mgmt_certificate = UNSET_VALUE
+        @mgmt_endpoint = UNSET_VALUE
+        @subscription_id = UNSET_VALUE
+
+        @vm_name = UNSET_VALUE
+        @vm_user = UNSET_VALUE
+        @vm_password = UNSET_VALUE
+        @vm_image = UNSET_VALUE
+        @vm_location = UNSET_VALUE
+        @vm_affinity_group = UNSET_VALUE
+
+        @cloud_service_name = UNSET_VALUE
+        @deployment_name = UNSET_VALUE
+        @tcp_endpoints = UNSET_VALUE
+        @ssh_private_key_file = UNSET_VALUE
+        @ssh_certificate_file = UNSET_VALUE
+        @ssh_port = UNSET_VALUE
+        @vm_size = UNSET_VALUE
+        @winrm_transport = UNSET_VALUE
+        @winrm_http_port = UNSET_VALUE
+        @winrm_https_port = UNSET_VALUE
+        @availability_set_name = UNSET_VALUE
+        @state_read_timeout = UNSET_VALUE
+      end
+
+      def finalize!
+        @storage_acct_name = ENV["AZURE_STORAGE_ACCOUNT"] if \
+          @storage_acct_name == UNSET_VALUE
+        @storage_access_key = ENV["AZURE_STORAGE_ACCESS_KEY"] if \
+          @storage_access_key == UNSET_VALUE
+        @mgmt_certificate = ENV["AZURE_MANAGEMENT_CERTIFICATE"] if \
+          @mgmt_certificate == UNSET_VALUE
+        @mgmt_endpoint = ENV["AZURE_MANAGEMENT_ENDPOINT"] if \
+          @mgmt_endpoint == UNSET_VALUE
+        @subscription_id = ENV["AZURE_SUBSCRIPTION_ID"] if \
+          @subscription_id == UNSET_VALUE
+
+        @vm_name = nil if @vm_name == UNSET_VALUE
+        @vm_user = 'vagrant' if @vm_user == UNSET_VALUE
+        @vm_password = nil if @vm_password == UNSET_VALUE
+        @vm_image = nil if @vm_image == UNSET_VALUE
+        @vm_location = nil if @vm_location == UNSET_VALUE
+        @vm_affinity_group = nil if @vm_affinity_group == UNSET_VALUE
+
+        @cloud_service_name = nil if @cloud_service_name == UNSET_VALUE
+        @deployment_name = nil if @deployment_name == UNSET_VALUE
+        @tcp_endpoints = nil if @tcp_endpoints == UNSET_VALUE
+        @ssh_private_key_file = nil if @ssh_private_key_file == UNSET_VALUE
+        @ssh_certificate_file = nil if @ssh_certificate_file == UNSET_VALUE
+        @ssh_port = nil if @ssh_port == UNSET_VALUE
+        @vm_size = nil if @vm_size == UNSET_VALUE
+        @winrm_transport = nil if @winrm_transport == UNSET_VALUE
+        @winrm_http_port = nil if @winrm_http_port == UNSET_VALUE
+        @winrm_https_port = nil if @winrm_https_port == UNSET_VALUE
+        @availability_set_name = nil if @availability_set_name == UNSET_VALUE
+
+        @state_read_timeout = 360 if @state_read_timeout == UNSET_VALUE
+
+        # This done due to a bug in Ruby SDK - it doesn't generate a storage 
+        # account name if add_role = true
+        if @storage_acct_name.nil? || @storage_acct_name.empty?
+          @storage_acct_name = Azure::Core::Utility.random_string(
+            "#{@vm_name}storage"
+          ).gsub(/[^0-9a-z ]/i, '').downcase[0..23]
+        end
+
+        if @cloud_service_name.nil? || @cloud_service_name.empty?
+          @cloud_service_name = Azure::Core::Utility.random_string(
+            "#{@vm_name}-service-"
+          )
+        end
+      end
+
+      def merge(other)
+        super.tap do |result|
+          result.mgmt_certificate = other.mgmt_certificate || \
+            self.mgmt_certificate
+          result.mgmt_endpoint = other.mgmt_endpoint || \
+            self.mgmt_endpoint
+          result.subscription_id = other.subscription_id || \
+            self.subscription_id
+          result.storage_account_name = other.storage_acct_name || \
+            self.storage_acct_name
+          result.storage_access_key = other.storage_access_key || \
+            self.storage_access_key
+        end
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+
+        # Azure connection properties related validation.
+        errors << "vagrant_azure.subscription_id.required" if \
+          @subscription_id.nil?
+        errors << "vagrant_azure.mgmt_certificate.required" if \
+          @mgmt_certificate.nil?
+        errors << "vagrant_azure.mgmt_endpoint.required" if \
+          @mgmt_endpoint.nil?
+
+        # Azure Virtual Machine related validation
+        errors << "vagrant_azure.vm_name.required" if @vm_name.nil?
+
+        { "Windows Azure Provider" => errors }
+      end
+    end
+  end
+end

data/lib/vagrant-azure/provider.rb

@@ -1,70 +1,70 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'vagrant'
-
-module VagrantPlugins
-  module WinAzure
-    class Provider < Vagrant.plugin('2', :provider)
-      attr_reader :driver
-
-      def initialize(machine)
-        @machine = machine
-
-        # Load the driver
-        machine_id_changed
-      end
-
-      def action(name)
-        # Attempt to get the action method from the Action class if it
-        # exists, otherwise return nil to show that we don't support the
-        # given action.
-        action_method = "action_#{name}"
-        return Action.send(action_method) if Action.respond_to?(action_method)
-        nil
-      end
-
-      def machine_id_changed
-        @driver = Driver.new(@machine)
-      end
-
-      def ssh_info
-        # Run a custom action called "read_ssh_info" which does what it
-        # says and puts the resulting SSH info into the `:machine_ssh_info`
-        # key in the environment.
-        env = @machine.action('read_ssh_info')
-        env[:machine_ssh_info]
-      end
-
-      def rdp_info
-        env = @machine.action('read_rdp_info')
-        env[:machine_ssh_info]
-      end
-
-      def winrm_info
-        env = @machine.action('read_winrm_info')
-        env[:machine_ssh_info]
-      end
-
-      def state
-        # Run a custom action we define called "read_state" which does what it
-        # says. It puts the state in the `:machine_state_id` key in the env
-        env = @machine.action('read_state')
-        state_id = env[:machine_state_id]
-
-        short = "Machine's current state is #{state_id}"
-        long = ""
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        id = @machine.id.nil? ? 'new' : @machine.id
-        "Azure (#{id})"
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'vagrant'
+
+module VagrantPlugins
+  module WinAzure
+    class Provider < Vagrant.plugin('2', :provider)
+      attr_reader :driver
+
+      def initialize(machine)
+        @machine = machine
+
+        # Load the driver
+        machine_id_changed
+      end
+
+      def action(name)
+        # Attempt to get the action method from the Action class if it
+        # exists, otherwise return nil to show that we don't support the
+        # given action.
+        action_method = "action_#{name}"
+        return Action.send(action_method) if Action.respond_to?(action_method)
+        nil
+      end
+
+      def machine_id_changed
+        @driver = Driver.new(@machine)
+      end
+
+      def ssh_info
+        # Run a custom action called "read_ssh_info" which does what it
+        # says and puts the resulting SSH info into the `:machine_ssh_info`
+        # key in the environment.
+        env = @machine.action('read_ssh_info')
+        env[:machine_ssh_info]
+      end
+
+      def rdp_info
+        env = @machine.action('read_rdp_info')
+        env[:machine_ssh_info]
+      end
+
+      def winrm_info
+        env = @machine.action('read_winrm_info')
+        env[:machine_ssh_info]
+      end
+
+      def state
+        # Run a custom action we define called "read_state" which does what it
+        # says. It puts the state in the `:machine_state_id` key in the env
+        env = @machine.action('read_state')
+        state_id = env[:machine_state_id]
+
+        short = "Machine's current state is #{state_id}"
+        long = ""
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        id = @machine.id.nil? ? 'new' : @machine.id
+        "Azure (#{id})"
+      end
+    end
+  end
+end

data/lib/vagrant-azure/provisioner/chef-solo.rb

@@ -0,0 +1,177 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#--------------------------------------------------------------------------
+
+require "fileutils"
+require "tempfile"
+
+module VagrantPlugins
+  module WinAzure
+    module Provisioner
+      class ChefSolo
+        attr_reader :provisioner
+
+        def initialize(env)
+          @env = env
+          @provisioner = env[:provisioner]
+        end
+
+        def provision_for_windows
+          # Copy the chef cookbooks roles data bags and environment folders to Guest
+          copy_folder_to_guest(provisioner.cookbook_folders)
+          copy_folder_to_guest(provisioner.role_folders)
+          copy_folder_to_guest(provisioner.data_bags_folders)
+          copy_folder_to_guest(provisioner.environments_folders)
+
+          # Upload Encrypted data bag
+          upload_encrypted_data_bag_secret if config.encrypted_data_bag_secret_key_path
+          setup_json
+          setup_solo_config
+          run_chef_solo
+
+          # TODO
+          # delete_encrypted_data_bag_secret
+        end
+
+        def setup_json
+          @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.json")
+
+          # Get the JSON that we're going to expose to Chef
+          json = config.json
+          json[:run_list] = config.run_list if !config.run_list.empty?
+          json = JSON.pretty_generate(json)
+
+          # Create a temporary file to store the data so we
+          # can upload it
+          temp = Tempfile.new("vagrant")
+          temp.write(json)
+          temp.close
+
+          remote_file = File.join(config.provisioning_path, "dna.json")
+          @env[:machine].provider.driver.upload(temp.path, remote_file)
+        end
+
+        def setup_solo_config
+          cookbooks_path = guest_paths(provisioner.cookbook_folders)
+          roles_path = guest_paths(provisioner.role_folders)
+          data_bags_path = guest_paths(provisioner.data_bags_folders).first
+          environments_path = guest_paths(provisioner.environments_folders).first
+          source_path = "#{VagrantPlugins::WinAzure.source_root}"
+          template_path = source_path + "/templates/provisioners/chef-solo/solo"
+          setup_config(template_path, "solo.rb", {
+            :cookbooks_path => cookbooks_path,
+            :recipe_url => config.recipe_url,
+            :roles_path => roles_path,
+            :data_bags_path => data_bags_path,
+            :environments_path => environments_path
+          })
+        end
+
+        def setup_config(template, filename, template_vars)
+          # If we have custom configuration, upload it
+          remote_custom_config_path = nil
+          if config.custom_config_path
+            expanded = File.expand_path(
+              config.custom_config_path, @machine.env.root_path)
+            remote_custom_config_path = File.join(
+              config.provisioning_path, "custom-config.rb")
+
+            @env[:machine].provider.driver.upload(expanded, remote_custom_config_path)
+          end
+
+          config_file = Vagrant::Util::TemplateRenderer.render(template, {
+            :custom_configuration => remote_custom_config_path,
+            :file_cache_path => config.file_cache_path,
+            :file_backup_path => config.file_backup_path,
+            :log_level        => config.log_level.to_sym,
+            :verbose_logging  => config.verbose_logging,
+            :http_proxy       => config.http_proxy,
+            :http_proxy_user  => config.http_proxy_user,
+            :http_proxy_pass  => config.http_proxy_pass,
+            :https_proxy      => config.https_proxy,
+            :https_proxy_user => config.https_proxy_user,
+            :https_proxy_pass => config.https_proxy_pass,
+            :no_proxy         => config.no_proxy,
+            :formatter        => config.formatter
+          }.merge(template_vars))
+
+          # Create a temporary file to store the data so we can upload it
+          temp = Tempfile.new("vagrant")
+          temp.write(config_file)
+          temp.close
+
+          remote_file = File.join(config.provisioning_path, filename)
+          @env[:machine].provider.driver.upload(temp.path, remote_file)
+        end
+
+        def run_chef_solo
+          if config.run_list && config.run_list.empty?
+            @env[:machine].ui.warn(I18n.t("vagrant.chef_run_list_empty"))
+          end
+
+          options = [
+            "-c #{config.provisioning_path}/solo.rb",
+            "-j #{config.provisioning_path}/dna.json"
+          ]
+
+          command_env = config.binary_env ? "#{config.binary_env} " : ""
+          command_args = config.arguments ? " #{config.arguments}" : ""
+          command = "#{command_env}#{chef_binary_path("chef-solo")} " +
+            "#{options.join(" ")} #{command_args}"
+          config.attempts.times do |attempt|
+            if attempt == 0
+              @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
+            else
+              @env[:machine].env.ui.info I18n.t("vagrant.provisioners.chef.running_solo_again")
+            end
+
+            command
+
+            @env[:machine].provider.driver.run_remote_ps(command) do |type, data|
+              # Output the data with the proper color based on the stream.
+              if (type == :stdout || type == :stderr)
+                @env[:ui].detail data
+              end
+            end
+          end
+
+        end
+
+        def upload_encrypted_data_bag_secret
+          @machine.env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
+          @env[:machine].provider.driver.upload(encrypted_data_bag_secret_key_path,
+                        config.encrypted_data_bag_secret)
+        end
+
+        def encrypted_data_bag_secret_key_path
+          File.expand_path(config.encrypted_data_bag_secret_key_path, @env[:machine].env.root_path)
+        end
+
+        def config
+          provisioner.config
+        end
+
+        def guest_paths(folders)
+          folders.map { |parts| parts[2] }
+        end
+
+        # Returns the path to the Chef binary, taking into account the
+        # `binary_path` configuration option.
+        def chef_binary_path(binary)
+          return binary if !config.binary_path
+          return File.join(config.binary_path, binary)
+        end
+
+        def copy_folder_to_guest(folders)
+          folders.each do |type, local_path, remote_path|
+            if type == :host
+              @env[:machine].provider.driver.upload(local_path, remote_path)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end