knife-azure 1.6.0 → 1.7.0

data/lib/chef/knife/azurerm_server_create.rb

@@ -132,17 +132,24 @@ class Chef
 
       option :azure_vnet_name,
         :long => "--azure-vnet-name VNET_NAME",
-        :description => "Optional. Specifies the virtual network name
-                        If this is an existing vnet then it must exists under the current resource group identified by resource-group
-                        If this is an existing vnet then vnet-subnet-name is required"
+        :description => "Optional. Specifies the virtual network name.
+                         This may be the name of an existing vnet present under the given resource group
+                         or this may be the name of a new vnet to be added in the given resource group.
+                         If not specified then azure-vm-name will be taken as the default name for vnet name as well.
+                         Along with this option azure-vnet-subnet-name option can also be specified or it can also be skipped."
 
       option :azure_vnet_subnet_name,
         :long => "--azure-vnet-subnet-name VNET_SUBNET_NAME",
-        :description => "Optional. Specifies the virtual network subnet name."
+        :description => "Optional. Specifies the virtual network subnet name.
+                         Must be specified only with azure-vnet-name option.
+                         This may be the name of an existing subnet present under the given virtual network
+                         or this may be the name of a new subnet to be added in the given virtual network.
+                         If not specified then azure-vm-name will be taken as the default name for subnet name as well.
+                         Value as 'GatewaySubnet' cannot be used as the name for the --azure-vnet-subnet-name option."
 
-      option :identity_file,
-        :long => "--identity-file FILENAME",
-        :description => "SSH identity file for authentication, optional. It is the RSA private key path. Specify either ssh-password or identity-file"
+      option :ssh_public_key,
+        :long => "--ssh-public-key FILENAME",
+        :description => "It is the ssh-rsa public key path. Specify either ssh-password or ssh-public-key"
 
       option :thumbprint,
         :long => "--thumbprint THUMBPRINT",
@@ -156,6 +163,11 @@ class Chef
         :long => "--cert-path PATH",
         :description => "SSL Certificate Path"
 
+      option :tcp_endpoints,
+        :short => "-t PORT_LIST",
+        :long => "--tcp-endpoints PORT_LIST",
+        :description => "Comma-separated list of TCP ports to open e.g. '80,433'"
+
       option :server_count,
         :long => "--server-count COUNT",
         :description => "Number of servers to create with same configuration.
@@ -188,16 +200,7 @@ class Chef
 
           vm_details = service.create_server(create_server_def)
         rescue => error
-          if error.class == MsRestAzure::AzureOperationError && error.body
-            if error.response.body['error']['code'] == 'DeploymentFailed'
-              ui.error("#{error.body['error']['message']}")
-            else
-              ui.error(error.response.body)
-            end
-          else
-            ui.error("#{error.message}")
-          end
-          Chef::Log.debug("#{error.backtrace.join("\n")}")
+          service.common_arm_rescue_block(error)
           exit
         end
       end
@@ -227,6 +230,10 @@ class Chef
           :server_count => locate_config_value(:server_count)
         }
 
+        if locate_config_value(:tcp_endpoints)
+          server_def[:tcp_endpoints] = locate_config_value(:tcp_endpoints)
+        end
+        
         server_def[:azure_storage_account] = locate_config_value(:azure_vm_name) if server_def[:azure_storage_account].nil?
         server_def[:azure_storage_account] = server_def[:azure_storage_account].gsub(/[!@#$%^&*()_-]/,'')
 
@@ -234,7 +241,7 @@ class Chef
         server_def[:azure_os_disk_name] = server_def[:azure_os_disk_name].gsub(/[!@#$%^&*()_-]/,'')
 
         server_def[:azure_vnet_name] = locate_config_value(:azure_vm_name) if server_def[:azure_vnet_name].nil?
-        server_def[:azure_vnet_subnet_name] = locate_config_value(:azure_vm_name) if locate_config_value(:azure_vnet_subnet_name).nil? && locate_config_value(:azure_vnet_name).nil?
+        server_def[:azure_vnet_subnet_name] = locate_config_value(:azure_vm_name) if locate_config_value(:azure_vnet_subnet_name).nil?
 
         server_def[:chef_extension] = get_chef_extension_name
         server_def[:chef_extension_publisher] = get_chef_extension_publisher
@@ -249,9 +256,9 @@ class Chef
           server_def[:ssh_user] = locate_config_value(:ssh_user)
           server_def[:ssh_password] = locate_config_value(:ssh_password)
           server_def[:disablePasswordAuthentication] = "false"
-          if locate_config_value(:identity_file)
+          if locate_config_value(:ssh_public_key)
             server_def[:disablePasswordAuthentication] = "true"
-            server_def[:ssh_key] = File.read(locate_config_value(:identity_file))
+            server_def[:ssh_key] = File.read(locate_config_value(:ssh_public_key))
           end
         end
 
@@ -285,14 +292,14 @@ class Chef
       end
 
       def validate_params!
-        if locate_config_value(:azure_vnet_name) && !locate_config_value(:azure_vnet_subnet_name)
-          raise ArgumentError,  "When a --azure-vnet-name is specified, the --azure-vnet-subnet-name must also be specified."
-        end
-
         if locate_config_value(:azure_vnet_subnet_name) && !locate_config_value(:azure_vnet_name)
           raise ArgumentError, "When --azure-vnet-subnet-name is specified, the --azure-vnet-name must also be specified."
         end
 
+        if locate_config_value(:azure_vnet_subnet_name) == 'GatewaySubnet'
+          raise ArgumentError, 'GatewaySubnet cannot be used as the name for --azure-vnet-subnet-name option. GatewaySubnet can only be used for virtual network gateways.'
+        end
+
         if is_image_windows?
           if locate_config_value(:winrm_user).nil? ||  locate_config_value(:winrm_password).nil?
             raise ArgumentError, "Please provide --winrm-user and --winrm-password options for Windows option."

data/lib/chef/knife/azurerm_server_delete.rb

@@ -104,16 +104,7 @@ class Chef
             ui.warn("Corresponding node and client for the #{vm_name} server were not deleted and remain registered with the Chef Server")
           end
         rescue => error
-          if error.class == MsRestAzure::AzureOperationError && error.body
-            if error.body['error']['code'] == 'ResourceNotFound'
-              ui.error("#{error.body['error']['message']}")
-            else
-              ui.error(error.body)
-            end
-          else
-            ui.error("#{error.message}")
-            Chef::Log.debug("#{error.backtrace.join("\n")}")
-          end
+          service.common_arm_rescue_block(error)
         end
       end
     end

data/lib/chef/knife/azurerm_server_list.rb

@@ -11,7 +11,11 @@ class Chef
       def run
         $stdout.sync = true
         validate_arm_keys!
-        service.list_servers(locate_config_value(:azure_resource_group_name))
+        begin
+          service.list_servers(locate_config_value(:azure_resource_group_name))
+        rescue => error
+          service.common_arm_rescue_block(error)
+        end
       end
     end
   end

data/lib/chef/knife/azurerm_server_show.rb

@@ -29,7 +29,11 @@ class Chef
       def run
         $stdout.sync = true
         validate_arm_keys!(:azure_resource_group_name)
-        service.show_server(@name_args[0], locate_config_value(:azure_resource_group_name))
+        begin
+          service.show_server(@name_args[0], locate_config_value(:azure_resource_group_name))
+        rescue => error
+          service.common_arm_rescue_block(error)
+        end
       end
 
     end

data/lib/chef/knife/bootstrap/bootstrap_options.rb

@@ -16,6 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#
+# Bootstrap options listed here are in accordance with the options supported by
+# Chef's bootstrap which bootstraps the target system through protocols like ssh
+# or winrm. In addition it contains additional options which gives the users a
+# choice to bootstrap the target system through cloud-api protocol.
+#
 
 require 'chef/knife/winrm_base'
 require 'chef/knife/bootstrap_windows_base'
@@ -72,30 +78,18 @@ class Chef
               :description => "Execute the bootstrap via sudo with password",
               :boolean => false
 
-            option :auto_update_client,
-              :long => "--auto-update-client",
-              :boolean => true,
-              :default => false,
-              :description => "Set this flag to enable auto chef client update in azure chef extension. This flag should be used with cloud-api bootstrap protocol only"
-
-            option :delete_chef_extension_config,
-              :long => "--delete-chef-extension-config",
-              :boolean => true,
-              :default => false,
-              :description => "Determines whether Chef configuration files removed when Azure removes the Chef resource extension from the VM. This option is only valid for the 'cloud-api' bootstrap protocol. The default is false."
-
-            option :uninstall_chef_client,
-              :long => "--uninstall-chef-client",
-              :boolean => true,
-              :default => false,
-              :description => "Determines whether Chef Client will be un-installed from the VM or not. This option is only valid for the 'cloud-api' bootstrap protocol. The default value is false."
-
             option :extended_logs,
               :long => "--extended-logs",
               :boolean => true,
               :default => false,
               :description => "Optional. Provide this option when --bootstrap-protocol is set to 'cloud-api'. It shows chef converge logs in detail."
 
+            option :chef_service_interval,
+              :long => "--chef-service-interval INTERVAL",
+              :description => "Optional. Provide this option when --bootstrap-protocol is set to 'cloud-api'.
+                                  It specifies the frequency (in minutes) at which the chef-service runs.
+                                  Pass 0 if you don't want the chef-service to be installed on the target machine."
+
   	  	  end
   	  	end
   	  end

data/lib/chef/knife/bootstrap/bootstrapper.rb

@@ -217,8 +217,8 @@ class Chef
           bootstrap.config[:host_key_verify] = config[:host_key_verify]
           Chef::Config[:knife][:secret] = config[:encrypted_data_bag_secret] if config[:encrypted_data_bag_secret]
           Chef::Config[:knife][:secret_file] = config[:encrypted_data_bag_secret_file] if config[:encrypted_data_bag_secret_file]
-          bootstrap.config[:secret] = locate_config_value(:secret) || locate_config_value(:encrypted_data_bag_secret)
-          bootstrap.config[:secret_file] = locate_config_value(:secret_file) || locate_config_value(:encrypted_data_bag_secret_file)
+          bootstrap.config[:secret] = locate_config_value(:encrypted_data_bag_secret)
+          bootstrap.config[:secret_file] = locate_config_value(:encrypted_data_bag_secret_file)
           bootstrap.config[:bootstrap_install_command] = locate_config_value(:bootstrap_install_command)
           bootstrap.config[:bootstrap_wget_options] = locate_config_value(:bootstrap_wget_options)
           bootstrap.config[:bootstrap_curl_options] = locate_config_value(:bootstrap_curl_options)
@@ -239,8 +239,16 @@ class Chef
             Chef::Config[:knife][:azure_chef_extension_version]
           else
             chef_extension_name = chef_extension_name.nil? ? get_chef_extension_name : chef_extension_name
-            extensions = service.get_extension(chef_extension_name, get_chef_extension_publisher)
-            extensions.css("Version").max.text.split(".").first + ".*"
+            if @service.instance_of? Azure::ResourceManagement::ARMInterface
+              service.get_latest_chef_extension_version({
+                :azure_service_location => locate_config_value(:azure_service_location),
+                :chef_extension_publisher => get_chef_extension_publisher,
+                :chef_extension => chef_extension_name
+              })
+            elsif @service.instance_of? Azure::ServiceManagement::ASMInterface
+              extensions = service.get_extension(chef_extension_name, get_chef_extension_publisher)
+              extensions.css("Version").max.text.split(".").first + ".*"
+            end
           end
         end
 
@@ -273,24 +281,15 @@ class Chef
           end
 
           pub_config[:runlist] = locate_config_value(:run_list).empty? ? "" : locate_config_value(:run_list).join(",").to_json
-          pub_config[:autoUpdateClient] = locate_config_value(:auto_update_client) ? "true" : "false"
-          pub_config[:deleteChefConfig] = locate_config_value(:delete_chef_extension_config) ? "true" : "false"
-          pub_config[:uninstallChefClient] = locate_config_value(:uninstall_chef_client) ? "true" : "false"
           pub_config[:custom_json_attr] = locate_config_value(:json_attributes) || {}
           pub_config[:extendedLogs] = locate_config_value(:extended_logs) ? "true" : "false"
-          pub_config[:hints] = ohai_hints if @service.instance_of? Azure::ResourceManagement::ARMInterface
+          pub_config[:hints] = ohai_hints if @service.instance_of?(Azure::ResourceManagement::ARMInterface) && !locate_config_value(:ohai_hints).nil?
+          pub_config[:chef_service_interval] = locate_config_value(:chef_service_interval) if locate_config_value(:chef_service_interval)
 
           # bootstrap attributes
           pub_config[:bootstrap_options] = {}
           pub_config[:bootstrap_options][:environment] = locate_config_value(:environment) if locate_config_value(:environment)
           pub_config[:bootstrap_options][:chef_node_name] = locate_config_value(:chef_node_name) if locate_config_value(:chef_node_name)
-
-          if ( locate_config_value(:secret_file) || locate_config_value(:encrypted_data_bag_secret_file) ) && ( !locate_config_value(:secret) || !locate_config_value(:encrypted_data_bag_secret) )
-            pub_config[:bootstrap_options][:encrypted_data_bag_secret] = Chef::EncryptedDataBagItem.load_secret(config[:secret_file])
-          elsif locate_config_value(:encrypted_data_bag_secret) || locate_config_value(:secret)
-            pub_config[:bootstrap_options][:encrypted_data_bag_secret] = locate_config_value(:encrypted_data_bag_secret) || locate_config_value(:secret)
-          end
-
           pub_config[:bootstrap_options][:chef_server_url] = Chef::Config[:chef_server_url] if Chef::Config[:chef_server_url]
           pub_config[:bootstrap_options][:validation_client_name] = Chef::Config[:validation_client_name] if Chef::Config[:validation_client_name]
           pub_config[:bootstrap_options][:node_verify_api_cert] = locate_config_value(:node_verify_api_cert) ? "true" : "false" if config.key?(:node_verify_api_cert)
@@ -301,6 +300,23 @@ class Chef
           pub_config
         end
 
+        def load_correct_secret
+          knife_secret_file = Chef::Config[:knife][:encrypted_data_bag_secret_file]
+          knife_secret = Chef::Config[:knife][:encrypted_data_bag_secret]
+          cli_secret_file = config[:encrypted_data_bag_secret_file]
+          cli_secret = config[:encrypted_data_bag_secret]
+
+          #The value set in knife.rb gets set in config object too
+          #That's why setting cli objects to nil if the values are specified in knife.rb
+          cli_secret_file = nil if cli_secret_file == knife_secret_file
+          cli_secret = nil if cli_secret == knife_secret
+
+          cli_secret_file = Chef::EncryptedDataBagItem.load_secret(cli_secret_file) if cli_secret_file != nil
+          knife_secret_file = Chef::EncryptedDataBagItem.load_secret(knife_secret_file) if knife_secret_file != nil
+
+          cli_secret_file || cli_secret || knife_secret_file || knife_secret
+        end
+
         def get_chef_extension_private_params
           pri_config = Hash.new
 
@@ -335,6 +351,9 @@ class Chef
             end
           end
 
+          # encrypted_data_bag_secret key for encrypting/decrypting the data bags
+          pri_config[:encrypted_data_bag_secret] = load_correct_secret
+
           pri_config
         end
       end

data/lib/chef/knife/bootstrap/common_bootstrap_options.rb

@@ -16,6 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#
+# Bootstrap options listed here are supported only for cloud-api protocol.
+#
 
 class Chef
   class Knife
@@ -81,36 +84,30 @@ class Chef
               :long => "--azure-extension-client-config CLIENT_PATH",
               :description => "Optional. Path to a client.rb file for use by the bootstrapped node."
 
-            option :auto_update_client,
-              :long => "--auto-update-client",
-              :boolean => true,
-              :default => false,
-              :description => "Set this flag to enable auto chef client update in azure chef extension."
-
-            option :delete_chef_extension_config,
-              :long => "--delete-chef-extension-config",
-              :boolean => true,
-              :default => false,
-              :description => "Determines whether Chef configuration files removed when Azure removes the Chef resource extension from the VM. The default is false."
-
-            option :uninstall_chef_client,
-              :long => "--uninstall-chef-client",
-              :boolean => true,
-              :default => false,
-              :description => "Determines whether Chef Client will be un-installed from the VM or not. The default value is false."
-
-            option :secret,
+            option :encrypted_data_bag_secret,
               :short => "-s SECRET",
               :long  => "--secret ",
               :description => "The secret key to use to encrypt data bag item values.  Can also be defaulted in your config with the key 'secret'"
 
-            option :secret_file,
+            option :encrypted_data_bag_secret_file,
               :long => "--secret-file SECRET_FILE",
               :description => "A file containing the secret key to use to encrypt data bag item values.  Can also be defaulted in your config with the key 'secret_file'"
-  	  	  end
-  	  	end
-  	  end
-  	end
+
+            option :extended_logs,
+              :long => "--extended-logs",
+              :boolean => true,
+              :default => false,
+              :description => "Optional. It shows chef convergence logs in detail."
+
+            option :chef_service_interval,
+              :long => "--chef-service-interval INTERVAL",
+              :description => "Optional. It specifies the frequency (in minutes) at which the chef-service runs.
+                                Pass 0 if you don't want the chef-service to be installed on the target machine."
+
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/chef/knife/bootstrap_azure.rb

@@ -42,6 +42,12 @@ class Chef
         begin
           if @name_args.length == 1
             service.add_extension(@name_args[0], set_ext_params)
+            if locate_config_value(:extended_logs)
+              print "\n\nWaiting for the Chef Extension to become available/ready"
+              wait_until_extension_available(Time.now, 10)
+              print "\n\nWaiting for the first chef-client run"
+              fetch_chef_client_logs(Time.now, 35)
+            end
           else
             raise ArgumentError, 'Please specify the SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length == 0
             raise ArgumentError, 'Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length > 1
@@ -61,6 +67,8 @@ class Chef
               azure_dns_name: locate_config_value(:azure_dns_name)
             })
 
+          ## if azure_dns_name value not passed by user then set it using the hostedservicename attribute from the retrieved server's object ##
+          config[:azure_dns_name] = server.hostedservicename if locate_config_value(:azure_dns_name).nil? && (server.instance_of? Azure::Role)
           if !server.instance_of? Azure::Role
             if server.nil?
               if !locate_config_value(:azure_dns_name).nil?
@@ -105,6 +113,56 @@ class Chef
 
         ext_params
       end
+
+      def wait_until_extension_available(extension_deploy_start_time, extension_availaibility_wait_timeout)
+        extension_availaibility_wait_time = ((Time.now - extension_deploy_start_time) / 60).round
+        if extension_availaibility_wait_time <= extension_availaibility_wait_timeout
+          ## extension availaibility wait time has not exceeded the maximum threshold set for the wait timeout ##
+          my_role = nil
+          sleep_and_wait = false
+          deployment = fetch_deployment
+          if deployment.at_css('Deployment Name') != nil
+            role_list_xml =  deployment.css('RoleInstanceList RoleInstance')
+            ## list of roles found under the deployment ##
+            role_list_xml.each do |role|
+              ## search in the roles list for the given role ##
+              if role.at_css("RoleName").text == @name_args[0]
+                my_role = role
+                break
+              end
+            end
+
+            if my_role && my_role.at_css("GuestAgentStatus Status").text == "Ready"
+              ## given role found and also GuestAgent is ready ##
+              extension = fetch_extension(my_role)
+              ## check if Chef Extension not found (which means it is not available/ready yet) then sleep_and_wait OR
+              ## if found (which means it is available/ready now) then proceed further with chef-client run logs fetch process ##
+              if extension.nil?
+                sleep_and_wait = true
+              end
+            else
+              ## given role not found or GuestAgent not ready yet ##
+              sleep_and_wait = true
+            end
+          else
+            ## deployment could not be found ##
+            sleep_and_wait = true
+          end
+
+          ## wait for some time and then re-fetch the status ##
+          if sleep_and_wait == true
+            print "#{ui.color('.', :bold)}"
+            sleep 30
+            wait_until_extension_available(
+              extension_deploy_start_time,
+              extension_availaibility_wait_timeout
+            )
+          end
+        else
+          ## extension availaibility wait time exceeded maximum threshold set for the wait timeout ##
+          raise "\nUnable to fetch chef-client run logs as Chef Extension seems to be unavailable even after #{extension_availaibility_wait_timeout} minutes of its deployment.\n"
+        end
+      end
     end
   end
 end

data/lib/chef/knife/bootstrap_azurerm.rb

@@ -20,6 +20,8 @@
 require 'chef/knife/azurerm_base'
 require 'chef/knife/bootstrap/common_bootstrap_options'
 require 'chef/knife/bootstrap/bootstrapper'
+require 'azure/resource_management/ARM_interface'
+require 'time'
 
 class Chef
   class Knife
@@ -34,7 +36,7 @@ class Chef
         :short => "-m LOCATION",
         :long => "--azure-service-location LOCATION",
         :description => "Required if not using an Affinity Group. Specifies the geographic location - the name of the data center location that is valid for your subscription.
-                                      Eg: West US, East US, East Asia, Southeast Asia, North Europe, West Europe",
+                                      Eg: westus, eastus, eastasia, southeastasia, northeurope, westeurope",
         :proc        => Proc.new { |lo| Chef::Config[:knife][:azure_service_location] = lo }
 
       def run
@@ -42,70 +44,58 @@ class Chef
         validate_arm_keys!(:azure_resource_group_name, :azure_service_location)
 
         begin
-           if @name_args.length == 1
+          if @name_args.length == 1
             ui.log("Creating VirtualMachineExtension....")
-            vm_extension = service.create_vm_extension(set_ext_params)
+            ext_params = set_ext_params
+            vm_extension = service.create_vm_extension(ext_params)
             if vm_extension
+              if ext_params[:chef_extension_public_param][:extendedLogs] == 'true'
+                service.fetch_chef_client_logs(ext_params[:azure_resource_group_name], ext_params[:azure_vm_name], ext_params[:chef_extension], Time.now)
+              end 
               ui.log("VirtualMachineExtension creation successfull.")
               ui.log("Virtual Machine Extension name is: #{vm_extension.name}")
               ui.log("Virtual Machine Extension ID is: #{vm_extension.id}")
             end
-           else
-             raise ArgumentError, 'Please specify the SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length == 0
-             raise ArgumentError, 'Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length > 1
-           end
-         rescue => error
-          if error.class == MsRestAzure::AzureOperationError && error.body
-            if error.body['error']['code'] == 'DeploymentFailed'
-              ui.error("#{error.body['error']['message']}")
-            else
-              ui.error(error.body)
-            end
           else
-            ui.error("#{error.message}")
-            Chef::Log.debug("#{error.backtrace.join("\n")}")
+            raise ArgumentError, 'Please specify the SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length == 0
+            raise ArgumentError, 'Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length > 1
           end
-          exit
-         end
+        rescue => error
+          service.common_arm_rescue_block(error)
+        end
       end
 
       def set_ext_params
-        begin
-          server = service.find_server(locate_config_value(:azure_resource_group_name), name_args[0])
+        server = service.find_server(locate_config_value(:azure_resource_group_name), name_args[0])
 
-          if server
-            if service.extension_already_installed?(server)
-              raise "Virtual machine #{server.name} already has Chef extension installed on it."
-            else
-              ext_params = Hash.new
-              case server.properties.storage_profile.os_disk.os_type.downcase
-              when 'windows'
-                ext_params[:chef_extension] = 'ChefClient'
-              when 'linux'
-                if ['ubuntu', 'debian', 'rhel', 'centos'].any? { |platform| server.properties.storage_profile.image_reference.offer.downcase.include? platform }
-                  ext_params[:chef_extension] = 'LinuxChefClient'
-                else
-                  raise "Offer #{server.properties.storage_profile.image_reference.offer} is not supported in the extension."
-                end
+        if server
+          if service.extension_already_installed?(server)
+            raise "Virtual machine #{server.name} already has Chef extension installed on it."
+          else
+            ext_params = Hash.new
+            case server.properties.storage_profile.os_disk.os_type.downcase
+            when 'windows'
+              ext_params[:chef_extension] = 'ChefClient'
+            when 'linux'
+              if ['ubuntu', 'debian', 'rhel', 'centos'].any? { |platform| server.properties.storage_profile.image_reference.offer.downcase.include? platform }
+                ext_params[:chef_extension] = 'LinuxChefClient'
               else
-                raise "OS type #{server.properties.storage_profile.os_disk.os_type} is not supported."
+                raise "Offer #{server.properties.storage_profile.image_reference.offer} is not supported in the extension."
               end
-
-              ext_params[:azure_resource_group_name] = locate_config_value(:azure_resource_group_name)
-              ext_params[:azure_vm_name] = @name_args[0]
-              ext_params[:azure_service_location] = locate_config_value(:azure_service_location)
-              ext_params[:chef_extension_publisher] = get_chef_extension_publisher
-              ext_params[:chef_extension_version] = get_chef_extension_version(ext_params[:chef_extension])
-              ext_params[:chef_extension_public_param] = get_chef_extension_public_params
-              ext_params[:chef_extension_private_param] = get_chef_extension_private_params
+            else
+              raise "OS type #{server.properties.storage_profile.os_disk.os_type} is not supported."
             end
-          else
-            raise "The given server '#{@name_args[0]}' does not exist under resource group '#{locate_config_value(:azure_resource_group_name)}'"
+
+            ext_params[:azure_resource_group_name] = locate_config_value(:azure_resource_group_name)
+            ext_params[:azure_vm_name] = @name_args[0]
+            ext_params[:azure_service_location] = locate_config_value(:azure_service_location)
+            ext_params[:chef_extension_publisher] = get_chef_extension_publisher
+            ext_params[:chef_extension_version] = get_chef_extension_version(ext_params[:chef_extension])
+            ext_params[:chef_extension_public_param] = get_chef_extension_public_params
+            ext_params[:chef_extension_private_param] = get_chef_extension_private_params
           end
-        rescue => error
-          ui.error("#{error.message}")
-          Chef::Log.debug("#{error.backtrace.join("\n")}")
-          exit
+        else
+          raise "The given server '#{@name_args[0]}' does not exist under resource group '#{locate_config_value(:azure_resource_group_name)}'"
         end
 
         ext_params
@@ -113,4 +103,4 @@ class Chef
 
     end
   end
-end
+end