chef-provisioning-azure 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c8e132474e2a8b048de47d9bd622dffc4b5d6d
-  data.tar.gz: 546d07efc616e3a0940d92858a4dc5070c56ee06
+  metadata.gz: 26141bfd34a60cbcca1f67c7ad5e812a680460a2
+  data.tar.gz: 83399cb5d0df2d81245787aaf2815b61dcd9a5c0
 SHA512:
-  metadata.gz: ffccd9082ab50fca64d404bf2b9c46c8488831b6ce759b5beabb79c851c863403adc38d03c42aa2f55416ef504f1fe467273e947ec2017b3e8fa54fd35462882
-  data.tar.gz: 1ed382128951f4a2100d0d1ddfe1e9c5b8addca62db91d42c8ee0f3644fda73220af3bef9f68b436d79372bf64b39d41884eee16635845b054f70a026c4ef388
+  metadata.gz: 563c5947d6cf351e69ef06591dba95d8d0b1ade40ad438a1347b9c228f8950096a57c526a8d08466a2bc245b8ec912e994e0694b9f2a46ec48bccf1303ea89ed
+  data.tar.gz: 1ac137365d67e200a3bee5a4594e78d855adb5085997e0bff8fbbf2414f746cdd01f5218ba86dbeef5fde2e911b3df4707250bd9ea8cf431c40917636ed46eef

data/lib/chef/provisioning/azure_driver/driver.rb

@@ -82,22 +82,40 @@ module AzureDriver
 
       image_id = machine_options[:image_id] || default_image_for_location(location)
 
-      params = {
-        vm_name: machine_spec.name,
-        vm_user: default_ssh_username,
-        image: image_id,
-        # This is only until SSH keys are added
-        password: machine_options[:password],
-        location: location
-      }
-
       Chef::Log.debug "Azure bootstrap options: #{bootstrap_options.inspect}"
+      
+      # If the cloud service exists already, need to add a role to it - otherwise create virtual machine (including cloud service)
+      cloud_service = azure_cloud_service_service.get_cloud_service(bootstrap_options[:cloud_service_name])
+
+      if cloud_service
+        action_handler.report_progress "Cloud Service #{bootstrap_options[:cloud_service_name]} already exists, adding role."
+        params = {
+          vm_name: machine_spec.name,
+          vm_user: default_ssh_username,
+          image: image_id,
+          # This is only until SSH keys are added
+          password: machine_options[:password],
+          cloud_service_name: bootstrap_options[:cloud_service_name]
+        }
+
+        action_handler.report_progress "Creating #{machine_spec.name} with image #{image_id} in #{bootstrap_options[:cloud_service_name]}..."
+        vm = azure_vm_service.add_role(params, bootstrap_options)
+      else
+        params = {
+          vm_name: machine_spec.name,
+          vm_user: default_ssh_username,
+          image: image_id,
+          # This is only until SSH keys are added
+          password: machine_options[:password],
+          location: location
+        }
+
+        action_handler.report_progress "Creating #{machine_spec.name} with image #{image_id} in #{location}..."
+        vm = azure_vm_service.create_virtual_machine(params, bootstrap_options)
+      end
 
-      action_handler.report_progress "Creating #{machine_spec.name} with image #{image_id} in #{location}..."
-      vm = azure_vm_service.create_virtual_machine(params, bootstrap_options)
       machine_spec.location['vm_name'] = vm.vm_name
-      action_handler.report_progress "Created #{vm.vm_name} in #{location}..."
-
+      action_handler.report_progress "Created #{vm.vm_name} in #{location}..."      
     end
 
     # (see Chef::Provisioning::Driver#ready_machine)
@@ -160,6 +178,10 @@ module AzureDriver
       @vm_service ||= Azure::VirtualMachineManagementService.new
     end
 
+    def azure_cloud_service_service
+      @cloud_service_service ||= Azure::CloudServiceManagementService.new
+    end
+
     def default_ssh_username
       'ubuntu'
     end
@@ -212,7 +234,10 @@ module AzureDriver
       remote_host = tcp_endpoint[:vip]
 
       # TODO: not this... replace with SSH key ASAP, only for getting this thing going...
-      ssh_options = { password: machine_options[:password] }
+      ssh_options = { 
+        password: machine_options[:password],
+        port: tcp_endpoint[:public_port] # use public port from Cloud Service endpoint
+      }
 
       options = {}
       options[:prefix] = 'sudo ' if machine_spec.location[:sudo] || username != 'root'

data/lib/chef/provisioning/azure_driver/version.rb

@@ -2,7 +2,7 @@
 class Chef
 module Provisioning
 module AzureDriver
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-azure
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef