knife-azure 1.0.0 → 1.0.2

data/lib/chef/knife/azure_server_create.rb

@@ -97,20 +97,29 @@ class Chef
         :long => "--hosted-service-name NAME",
         :description => "specifies the name for the hosted service"
 
+      option :hosted_service_description,
+        :short => "-D DESCRIPTION",
+        :long => "--hosted_service_description DESCRIPTION",
+        :description => "Description for the hosted service"
+
+      option :storage_account,
+        :short => "-a NAME",
+        :long => "--storage-account NAME",
+        :description => "specifies the name for the hosted service"
+
       option :role_name,
         :short => "-R name",
         :long => "--role-name NAME",
         :description => "specifies the name for the virtual machine"
 
       option :host_name,
-        :short => "-H NAME",
         :long => "--host-name NAME",
         :description => "specifies the host name for the virtual machine"
 
-      option :media_location_prefix,
-        :short => "-m PREFIX",
-        :long => "--media-location-prefix PREFIX",
-        :description => "user account name (used for constructing os disk media link)"
+      option :service_location,
+        :short => "-m LOCATION",
+        :long => "--service-location LOCATION",
+        :description => "specify the Geographic location for the virtual machine and services"
 
       option :os_disk_name,
         :short => "-o DISKNAME",
@@ -138,6 +147,14 @@ class Chef
         :description => "Comma separated list of UDP local and public ports to open i.e. '80:80,433:5000'"
 
 
+      def strip_non_ascii(string)
+        string.gsub(/[^0-9a-z ]/i, '')
+      end
+
+      def random_string(len=10)
+        (0...len).map{65.+(rand(25)).chr}.join
+      end
+
       def tcp_test_ssh(fqdn, sshport)
         tcp_socket = TCPSocket.new(fqdn, sshport)
         readable = IO.select([tcp_socket], nil, nil, 5)
@@ -174,14 +191,13 @@ class Chef
         details << ui.color('winner is', :bold, :blue)
         [
           :azure_subscription_id, 
-          :azure_pem_file, 
+          :azure_mgmt_cert, 
           :azure_host_name,
-          :hosted_service_name, 
           :role_name, 
           :host_name, 
           :ssh_user, 
           :ssh_password, 
-          :media_location_prefix, 
+          :service_location, 
           :source_image, 
           :role_size
         ].each do |key|
@@ -195,11 +211,27 @@ class Chef
       end
       def run
         $stdout.sync = true
+        storage = nil
 
         Chef::Log.info("validating...")
         validate!
 
         Chef::Log.info("creating...")
+      
+        if not locate_config_value(:hosted_service_name)
+          config[:hosted_service_name] = [strip_non_ascii(locate_config_value(:role_name)), random_string].join
+        end
+
+        #If Storage Account is not specified, check if the geographic location has one to re-use 
+        if not locate_config_value(:storage_account)
+          storage_accts = connection.storageaccounts.all
+          storage = storage_accts.find { |storage_acct| storage_acct.location.to_s == locate_config_value(:service_location) }
+          if not storage
+            config[:storage_account] = [strip_non_ascii(locate_config_value(:role_name)), random_string].join.downcase
+          else
+            config[:storage_account] = storage.name.to_s
+          end
+        end
         server = connection.deploys.create(create_server_def)
 
         puts("\n")
@@ -249,14 +281,13 @@ class Chef
       def validate!
         super([
               :azure_subscription_id, 
-              :azure_pem_file, 
+              :azure_mgmt_cert, 
               :azure_host_name,
-              :hosted_service_name, 
               :role_name, 
               :host_name, 
               :ssh_user, 
               :ssh_password, 
-              :media_location_prefix, 
+              :service_location, 
               :source_image, 
               :role_size
         ])
@@ -265,11 +296,12 @@ class Chef
       def create_server_def
         server_def = {
           :hosted_service_name => locate_config_value(:hosted_service_name), 
+          :storage_account => locate_config_value(:storage_account),
           :role_name => locate_config_value(:role_name), 
           :host_name => locate_config_value(:host_name), 
-          :ssh_user => locate_config_value(:ssh_user), 
+          :ssh_user => locate_config_value(:ssh_user),
           :ssh_password => locate_config_value(:ssh_password), 
-          :media_location_prefix => locate_config_value(:media_location_prefix), 
+          :service_location => locate_config_value(:service_location), 
           :os_disk_name => locate_config_value(:os_disk_name), 
           :source_image => locate_config_value(:source_image), 
           :role_size => locate_config_value(:role_size),

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,240 +1,270 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: knife-azure
-version: !ruby/object:Gem::Version
-  version: 1.0.0
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Barry Davis
+- Chirag Jog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: knife-azure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-06-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  prerelease: false
+  name: chef
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 3
+        - 12
+        version: "3.12"
+  prerelease: false
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: rubygems-bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 2
+        - 9
+        version: 0.2.9
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-- !ruby/object:Gem::Dependency
-  name: interactive_editor
-  requirement: !ruby/object:Gem::Requirement
+  name: equivalent-xml
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: net-ssh
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  prerelease: false
+  name: net-ssh-multi
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
+        version: 1.0.4
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: net-scp
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-description: A plugin to Opscode knife for creating instances on the Microsoft Azure
-  platform
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 5
+        - 5
+        version: 1.5.5
+  prerelease: false
+  name: nokogiri
+  version_requirements: *id012
+description: A plugin to Opscode knife for creating instances on the Microsoft Azure platform
 email: oss@opscode.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
-files:
-- Gemfile
-- Guardfile
+files: 
 - LICENSE
-- Rakefile
-- knife-azure.gemspec
-- lib/azure/connection.rb
-- lib/azure/deploy.rb
-- lib/azure/disk.rb
-- lib/azure/host.rb
+- README.rdoc
 - lib/azure/image.rb
 - lib/azure/rest.rb
-- lib/azure/role.rb
+- lib/azure/connection.rb
+- lib/azure/host.rb
+- lib/azure/disk.rb
+- lib/azure/storageaccount.rb
+- lib/azure/deploy.rb
 - lib/azure/utility.rb
-- lib/chef/knife/azure_base.rb
-- lib/chef/knife/azure_image_list.rb
-- lib/chef/knife/azure_server_create.rb
+- lib/azure/role.rb
+- lib/knife-azure/version.rb
 - lib/chef/knife/azure_server_delete.rb
 - lib/chef/knife/azure_server_describe.rb
+- lib/chef/knife/azure_server_create.rb
+- lib/chef/knife/azure_image_list.rb
+- lib/chef/knife/azure_base.rb
 - lib/chef/knife/azure_server_list.rb
-- lib/knife-azure/version.rb
-- readme.rdoc
-- spec/functional/deploys_test.rb
-- spec/functional/host_test.rb
-- spec/functional/images_list_test.rb
-- spec/functional/role_test.rb
-- spec/integration/role_lifecycle_test.rb
-- spec/spec_helper.rb
-- spec/unit/assets/create_deployment.xml
-- spec/unit/assets/create_deployment_in_progress.xml
-- spec/unit/assets/create_host.xml
-- spec/unit/assets/create_role.xml
-- spec/unit/assets/list_deployments_for_service000.xml
-- spec/unit/assets/list_deployments_for_service001.xml
-- spec/unit/assets/list_deployments_for_service002.xml
-- spec/unit/assets/list_deployments_for_service003.xml
-- spec/unit/assets/list_disks.xml
-- spec/unit/assets/list_hosts.xml
-- spec/unit/assets/list_images.xml
-- spec/unit/assets/post_success.xml
-- spec/unit/deploys_list_spec.rb
-- spec/unit/disks_spec.rb
-- spec/unit/hosts_spec.rb
-- spec/unit/images_spec.rb
-- spec/unit/query_azure_mock.rb
-- spec/unit/roles_create_spec.rb
-- spec/unit/roles_list_spec.rb
 homepage: http://github.com/opscode/knife-azure
-licenses:
+licenses: 
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3931309687418111457
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A plugin to Opscode knife for creating instances on the Microsoft Azure platform
 test_files: []
+