[CLOUD-261][CLOUD-262] Update to packer 1.1.0:

* [CLOUD-262] packer > 0.10.1 uses its own `azure-arm` builder, obsoleting use of
the `packer-azure` plugin. This requires new azure builder attributes in
the `publishing_credentials.json` file.
* packer >= 1.0.1 supports alicloud, enabling
#43.

Signed-off-by: Yvonne Lam <[email protected]>

Author: Yvonne Lam

README.md

@@ -102,14 +102,10 @@ hash for each cloud. If you wish to run these builders you'll need to create a
 {
   "id": "publishing_credentials",
   "azure": {
-    "publish_settings": {
-      "schema_version": "2.0",
-      "publish_method": "AzureServiceManagementAPI",
-      "service_management_url": "https://management.core.windows.net",
-      "subscription_id": "1XXXXXX-XXXX-XXXX-XXXXXXXXXX",
-      "subscription_name": "Partner Engineering",
-      "management_certificate": "MIIKDAIXXXXXXX....."
-    }
+      "subscription_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
+      "subscription_name": "XXXXXXXXXXXXXXXXXXXX",
+      "client_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
+      "client_secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
   },
   "gce": {
     "account": {

attributes/azure.rb

@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-cred_dir = ::File.expand_path(::File.join('~', '.azure'))
-publish_settings_path = ::File.join(cred_dir, 'marketplace.publish_settings')
-
-default['marketplace_image']['azure']['cred_dir'] = cred_dir
-default['marketplace_image']['azure']['publish_settings_path'] = publish_settings_path
 
 default['marketplace_image']['azure']['automate']['enabled'] = false
 default['marketplace_image']['azure']['compliance']['enabled'] = false
@@ -21,18 +16,24 @@
   'free_node_count' => 5,
 }
 
+creds = Chef::DataBagItem.load('marketplace_image', 'publishing_credentials')
+
 azure_builder_config = {
   'name' => 'azure_automate_BYOL',
-  'type' => 'azure',
-  'publish_settings_path' => publish_settings_path,
-  'subscription_name' => 'Partner Engineering',
-  'storage_account' => 'ampimages',
-  'storage_account_container' => 'images',
+  'type' => 'azure-arm',
+  'subscription_id' => "#{creds['azure']['subscription_id']}",
+  'client_id' => "#{creds['azure']['client_id']}",
+  'client_secret' => "#{creds['azure']['client_secret']}",
+  'resource_group_name' => 'publish-marketplace-images',
+  'storage_account' => 'marketplaceimages',
+  'capture_container_name' => 'vhds',
   'os_type' => 'Linux',
-  'os_image_label' => 'Ubuntu Server 14.04 LTS',
+  'image_publisher' => 'Canonical',
+  'image_offer' => 'UbuntuServer',
+  'image_sku' => '14.04.5-LTS',
   'location' => 'East US',
-  'instance_size' => 'Large',
-  'user_image_label' => 'Chef_Automate_BYOL_{{timestamp}}',
+  'vm_size' => 'Standard_D3_v2',
+  'capture_name_prefix' => 'Chef_Automate_BYOL',
 }
 
 default['marketplace_image']['azure']['automate'] = {

metadata.rb

@@ -9,4 +9,4 @@
 
 chef_version '>=12.19'
 
-depends 'packman'
+depends 'packman' '>=0.2.0'

recipes/_packer.rb

@@ -12,16 +12,6 @@
 
 creds = data_bag_item('marketplace_image', 'publishing_credentials')
 
-if creds['azure']
-  directory node['marketplace_image']['azure']['cred_dir']
-
-  template node['marketplace_image']['azure']['publish_settings_path'] do
-    sensitive true
-    source 'azure_publish_settings.xml.erb'
-    variables creds['azure']['publish_settings']
-  end
-end
-
 if creds['aws']
   directory node['marketplace_image']['aws']['cred_dir']