wombat-cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4813af6ebde7741373463711fe1de2c8d26ca338
-  data.tar.gz: 46c222e69a359a9fbd5ea212badbf3a474bfe0f1
+  metadata.gz: c1f966f2cf4c9c6514f8d6c0b68dc32f01efc68d
+  data.tar.gz: ed36aba1cedad1df91b9edb32f09385238d4e806
 SHA512:
-  metadata.gz: 9c9c77b5b678e92f7e259ff95e96e4307d0392c3d34e6d7c1622b6423683121fa0fab8137296c2f6c93359c6badb5b60cff45a7c9555546ce8a709b15e2ee8d3
-  data.tar.gz: dba71212dd430556d1a4375d177eecda28de86d0476c538c0e463fa25dc49b16c099cf8e4b70cc6bc2478d723ce375aa487cece244f109962f349f6e53ea328a
+  metadata.gz: 56ae65f44e1774b4008c886ee89fd041942f26e907a6a8ddf8741fd259449c07892d0580546516df60e6ec36a6a68a12c7dc789a854561e4bb6d48dc8c97761f
+  data.tar.gz: 0098f80a1d584216b43ae480e77fb692254111d13b19496d80d6ef3c3d1dbda4aba435fde057214dd4bd7395fba2d7f73823b6f97fb8619157e0c0ddbe07db60

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## [v0.4.1](https://github.com/chef-cft/wombat/tree/v0.4.1) (2017-02-23)
+[Full Changelog](https://github.com/chef-cft/wombat/compare/v0.4.0...v0.4.1)
+
+**Closed issues:**
+
+- can't build infranodes [\#299](https://github.com/chef-cft/wombat/issues/299)
+- `wombat outputs` and azure [\#293](https://github.com/chef-cft/wombat/issues/293)
+
+**Merged pull requests:**
+
+- Options not being seen by `base\_image` fixes \#299 [\#300](https://github.com/chef-cft/wombat/pull/300) ([russellseymour](https://github.com/russellseymour))
+- Enabled outputs for Azure deployments [\#298](https://github.com/chef-cft/wombat/pull/298) ([russellseymour](https://github.com/russellseymour))
+- chef-server-ctl don't work on compliance [\#297](https://github.com/chef-cft/wombat/pull/297) ([binamov](https://github.com/binamov))
+- Added support to selectively delete items in the RG [\#296](https://github.com/chef-cft/wombat/pull/296) ([russellseymour](https://github.com/russellseymour))
+- uses the password from wombat [\#295](https://github.com/chef-cft/wombat/pull/295) ([binamov](https://github.com/binamov))
+- Modified the way in which Azure tags can be set [\#294](https://github.com/chef-cft/wombat/pull/294) ([russellseymour](https://github.com/russellseymour))
+- Updating vagrantfile, lower resources and fixed cookbook names [\#292](https://github.com/chef-cft/wombat/pull/292) ([cheeseplus](https://github.com/cheeseplus))
+
 ## [v0.4.0](https://github.com/chef-cft/wombat/tree/v0.4.0) (2017-02-10)
 [Full Changelog](https://github.com/chef-cft/wombat/compare/v0.3.4...v0.4.0)
 

data/generator_files/Vagrantfile

@@ -18,13 +18,11 @@ Vagrant.configure(2) do |config|
 
   # Provision a Chef server with push jobs installed
   config.vm.define "chef-server" do |cs|
-
     cs.vm.hostname = "chef"
     cs.vm.network "private_network", ip: "172.31.54.10"
-
     cs.vm.provider "virtualbox" do |v|
-      v.memory = 2048
-      v.cpus = 2
+      v.memory = 1024
+      v.cpus = 1
     end
 
     cs.vm.provision "chef_solo" do |chef|
@@ -37,21 +35,19 @@ Vagrant.configure(2) do |config|
         }
       }
     end
-
   end
 
   config.vm.define "automate" do |d|
-
-    d.vm.network "private_network", ip: "172.31.54.11"
     d.vm.hostname = "automate"
+    d.vm.network "private_network", ip: "172.31.54.11"
     d.vm.provider "virtualbox" do |v|
-      v.memory = 2048
-      v.cpus = 2
+      v.memory = 1024
+      v.cpus = 1
     end
 
     d.vm.provision "chef_solo" do |chef|
       chef.cookbooks_path = "vendored-cookbooks/automate"
-      chef.add_recipe "mock-data"
+      chef.add_recipe "mock_data"
       chef.add_recipe "automate"
       chef.json = {
         "demo" => {
@@ -59,13 +55,11 @@ Vagrant.configure(2) do |config|
         }
       }
     end
-
   end
 
   config.vm.define "compliance" do |cc|
     cc.vm.hostname = "compliance"
     cc.vm.network "private_network", ip: "172.31.54.12"
-
     cc.vm.provider "virtualbox" do |v|
       v.memory = 1024
       v.cpus = 1
@@ -73,7 +67,7 @@ Vagrant.configure(2) do |config|
 
     cc.vm.provision "chef_solo" do |chef|
       chef.cookbooks_path = "vendored-cookbooks/compliance"
-      chef.add_recipe "mock-data"
+      chef.add_recipe "mock_data"
       chef.add_recipe "compliance"
       chef.json = {
         "demo" => {
@@ -81,17 +75,20 @@ Vagrant.configure(2) do |config|
         }
       }
     end
-
   end
 
   config.vm.define "build-node-1" do |bn|
-    bn.vm.network "private_network", ip: "172.31.54.101"
     bn.vm.hostname = "build-node-1"
+    bn.vm.network "private_network", ip: "172.31.54.101"
+    bn.vm.provider "virtualbox" do |v|
+      v.memory = 768
+      v.cpus = 1
+    end
 
     bn.vm.provision "chef_solo" do |chef|
-      chef.cookbooks_path = "vendored-cookbooks/build-node"
-      chef.add_recipe "mock-data"
-      chef.add_recipe "build-node"
+      chef.cookbooks_path = "vendored-cookbooks/build_node"
+      chef.add_recipe "mock_data"
+      chef.add_recipe "build_node"
       chef.json = {
         "demo" => {
           "admin-user" => "vagrant"
@@ -101,14 +98,17 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "workstation", primary: true do |wk|
-    wk.vm.network "private_network", ip: "172.31.54.99"
-    wk.vm.hostname = "workstation"
-
     wk.vm.box = "mwrock/Windows2012R2"
+    wk.vm.hostname = "workstation"
+    wk.vm.network "private_network", ip: "172.31.54.99"
+    wk.vm.provider "virtualbox" do |v|
+      v.memory = 4096
+      v.cpus = 2
+    end
 
     wk.vm.provision "chef_solo" do |chef|
       chef.cookbooks_path = "vendored-cookbooks/workstation"
-      chef.add_recipe "mock-data"
+      chef.add_recipe "mock_data"
       chef.add_recipe "workstation"
       chef.json = {
         "demo" => {
@@ -117,5 +117,4 @@ Vagrant.configure(2) do |config|
       }
     end
   end
-
 end

data/generator_files/packer/workstation.json

@@ -62,7 +62,7 @@
             "location": "{{user `azure_location`}}",
             "vm_size": "Standard_DS3_v2",
             "communicator": "winrm",
-            "winrm_username": "packer",
+            "winrm_username": "azure",
             "winrm_use_ssl": "true",
             "winrm_insecure": "true",
             "winrm_port": 5986,

data/generator_files/templates/arm.json.erb

@@ -45,7 +45,7 @@
 
     "sa": {
       "name": "[parameters('storageAccountName')]",
-      "container": "vhds",
+      "container": "[concat('vhds-', variables('unique'))]",
       "type": "Standard_LRS"
     },
 
@@ -542,7 +542,7 @@
         },
         "osProfile": {
           "computerName": "[concat('chef-', variables('uniqueShort'))]",
-          "customData": "[base64(concat(variables('customData'), '\n\nruncmd:\n - hostnamectl set-hostname compliance\n - chef-server-ctl reconfigure'))]",
+          "customData": "[base64(concat(variables('customData'), '\n\nruncmd:\n - hostnamectl set-hostname compliance\n - compliance-ctl reconfigure'))]",
           "adminUsername": "ubuntu",
           "adminPassword": "[parameters('adminPassword')]"
         },

data/generator_files/templates/arm.tidy.json.erb

@@ -0,0 +1,32 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.1",
+    "parameters": {
+        "storageAccountName": {
+            "type": "string",
+            "metadata": {
+                "description": "Name of the storage account that should be used to store the machine disks"
+            },
+            "defaultValue": "<%= @storage_account %>"
+        }
+    },
+    "variables": {
+        "sa": {
+            "name": "[parameters('storageAccountName')]",
+            "type": "Standard_LRS"
+        },
+        "location": "[resourceGroup().location]"
+    },
+    "resources": [
+        {
+            "type": "Microsoft.Storage/storageAccounts",
+            "name": "[variables('sa').name]",
+            "apiVersion": "2015-06-15",
+            "location": "[variables('location')]",
+            "properties": {
+                "accountType": "[variables('sa').type]"
+            }
+        }
+    ],
+    "outputs": {}
+}

data/lib/wombat/build.rb

@@ -97,7 +97,6 @@ module Wombat
 
         # Create hash to be used as tags on the resource group
         tags = {
-          InUse: "true",
           owner: ENV['USER']
         }
 
@@ -106,6 +105,25 @@ module Wombat
           tags[:owner] = wombat['owner']
         end
 
+        # Determine if there are any tags specified in the azure wmbat section that need to be added
+        if wombat['azure'].key?('tags') && wombat['azure']['tags'].length > 0
+
+          # Check to see if there are more than 15 tags in which case output a warning
+          if wombat['azure']['tags'].length > 14
+            warn ('More than 15 tags have been specified, only the first 15 will be added.  This is a restriction in Azure.')
+          end
+
+          # Iterate around the tags and add each one to the tags array, up to 15
+          wombat['azure']['tags'].each_with_index do |(key, value), index|
+            tags[key] = value
+
+            if index == 13
+              break
+            end
+          end
+
+        end
+
         # add the tags hash to the parameters
         resource_group.tags = tags
 
@@ -267,7 +285,7 @@ module Wombat
       return nil
     end
 
-    def base_image(template, builder)
+    def base_image(template, builder, options)
       cloud = b_to_c(builder)
       if template =~ /workstation/
         wombat[cloud]['source_image']['windows']
@@ -307,8 +325,8 @@ module Wombat
       cmd.insert(2, "--var winrm_username=Administrator")
       cmd.insert(2, "--var workstation-number=#{options['workstation-number']}") if template =~ /workstation/
       cmd.insert(2, "--var workstations=#{wombat['workstations']['count']}")
-      cmd.insert(2, "--var aws_source_ami=#{base_image(template, builder)}") if builder =~ /amazon-ebs/
-      cmd.insert(2, "--var gce_source_image=#{base_image(template, builder)}") if builder =~ /googlecompute/
+      cmd.insert(2, "--var aws_source_ami=#{base_image(template, builder, options)}") if builder =~ /amazon-ebs/
+      cmd.insert(2, "--var gce_source_image=#{base_image(template, builder, options)}") if builder =~ /googlecompute/
       cmd.insert(2, "--var azure_location=#{wombat['azure']['location']}")
       cmd.insert(2, "--var ssh_username=#{linux}")
       cmd.insert(2, "--var azure_resource_group=#{wombat['name']}")

data/lib/wombat/cli.rb

@@ -89,6 +89,15 @@ module Wombat
             opts.on("-c CLOUD", "--cloud CLOUD", "Select cloud") do |opt|
               options.cloud = opt
             end
+
+            opts.on("--all", "Remove entire Resource Group which includes images (Azure Only)") do |opt|
+              options.remove_all = opt
+            end
+
+            opts.on("--async", "Delete resources asynchronously when not removing all, e.g. do not block command line.  (Azure Only)") do |opt|
+              options.azure_async = opt
+            end
+
           },
           argv: stack_argv_proc
         },
@@ -143,7 +152,11 @@ module Wombat
         outputs: {
           class: OutputRunner,
           parser: OptionParser.new { |opts|
-            opts.banner = "Usage: #{NAME} outputs [TEMPLATE ...]"
+            opts.banner = "Usage: #{NAME} outputs STACK"
+
+            opts.on("-c CLOUD", "--cloud CLOUD", "Select cloud") do |opt|
+              options.cloud = opt
+            end
           },
           argv: stack_argv_proc
         },

data/lib/wombat/common.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'erb'
 require 'benchmark'
 require 'fileutils'
+require 'ms_rest_azure'
 
 module Wombat
   module Common
@@ -206,11 +207,17 @@ module Wombat
         warn('No lock - skipping template creation')
       else
 
+        @demo = lock['name']
+        @version = lock['version']
+        @ttl = lock['ttl']
+
         # Determine the region/location/zone for the specific cloud
         case cloud
         when 'aws'
           region = lock['aws']['region']
-          template_file = "cfn.json.erb"
+          template_files = {
+            "cfn.json.erb": "#{conf['stack_dir']}/#{@demo}.json"
+          }
           @chef_server_ami = lock['amis'][region]['chef-server']
           @automate_ami = lock['amis'][region]['automate']
           @compliance_ami = lock['amis'][region]['compliance']
@@ -219,13 +226,14 @@ module Wombat
         when 'azure'
           region = lock['azure']['location']
           @storage_account = lock['azure']['storage_account']
-          template_file = "arm.json.erb"
+          template_files = {
+            "arm.json.erb": "#{conf['stack_dir']}/#{@demo}.json",
+            "arm.tidy.json.erb": "#{conf['stack_dir']}/#{@demo}.tidy.json"
+          }
           @chef_server_uri = lock['amis'][region]['chef-server']
           @automate_uri = lock['amis'][region]['automate']
           @compliance_uri = lock['amis'][region]['compliance']
-
-        # set an admin password for the machines that are created
-        @password = "aAan0orxevCma4gG"
+          @password = lock['workstations']['password']
         when 'gce'
           region = lock['gce']['zone']
         end
@@ -251,14 +259,13 @@ module Wombat
           end
         end
 
-        @demo = lock['name']
-        @version = lock['version']
-        @ttl = lock['ttl']
-
-        rendered_cfn = ERB.new(File.read("#{conf['template_dir']}/#{template_file}"), nil, '-').result(binding)
-        Dir.mkdir(conf['stack_dir'], 0755) unless File.exist?(conf['stack_dir'])
-        File.open("#{conf['stack_dir']}/#{@demo}.json", 'w') { |file| file.puts rendered_cfn }
-        banner("Generated: #{conf['stack_dir']}/#{@demo}.json")
+        # Iterate around each of the template files that have been defined and render it
+        template_files.each do |template_file, destination|
+          rendered_cfn = ERB.new(File.read("#{conf['template_dir']}/#{template_file}"), nil, '-').result(binding)
+          Dir.mkdir(conf['stack_dir'], 0755) unless File.exist?(conf['stack_dir'])
+          File.open("#{destination}", 'w') { |file| file.puts rendered_cfn }
+          banner("Generated: #{destination}")
+        end
       end
     end
 
@@ -270,5 +277,72 @@ module Wombat
         false
       end
     end
+
+    # Connect to Azure using environment variables
+    #
+    # 
+    def connect_azure
+
+        # Create the connection to Azure using the information in the environment variables
+        tenant_id = ENV['AZURE_TENANT_ID']
+        client_id = ENV['AZURE_CLIENT_ID']
+        client_secret = ENV['AZURE_CLIENT_SECRET']
+
+        token_provider = MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret)
+        MsRest::TokenCredentials.new(token_provider)
+    end
+
+    # Track the progress of the deployment in Azure
+    #
+    # ===== Attributes
+    #
+    # * +rg_name+ - Name of the resource group being deployed to
+    # * +deployment_name+ - Name of the deployment that is currently being processed
+    def follow_azure_deployment(rg_name, deployment_name)
+
+      end_provisioning_states = 'Canceled,Failed,Deleted,Succeeded'
+      end_provisioning_state_reached = false
+
+      until end_provisioning_state_reached
+        list_outstanding_deployment_operations(rg_name, deployment_name)
+        sleep 10
+        deployment_provisioning_state = deployment_state(rg_name, deployment_name)
+        end_provisioning_state_reached = end_provisioning_states.split(',').include?(deployment_provisioning_state)
+      end
+      info format("Resource Template deployment reached end state of %s", deployment_provisioning_state)
+    end
+
+    # Get a list of the outstanding deployment operations
+    #
+    # ===== Attributes
+    #
+    # * +rg_name+ - Name of the resource group being deployed to
+    # * +deployment_name+ - Name of the deployment that is currently being processed    
+    def list_outstanding_deployment_operations(rg_name, deployment_name)
+      end_operation_states = 'Failed,Succeeded'
+      deployment_operations = resource_management_client.deployment_operations.list(rg_name, deployment_name)
+      deployment_operations.each do |val|
+        resource_provisioning_state = val.properties.provisioning_state
+        unless val.properties.target_resource.nil?
+          resource_name = val.properties.target_resource.resource_name
+          resource_type = val.properties.target_resource.resource_type
+        end
+        end_operation_state_reached = end_operation_states.split(',').include?(resource_provisioning_state)
+        unless end_operation_state_reached
+          info format("resource %s '%s' provisioning status is %s", resource_type, resource_name, resource_provisioning_state)
+        end
+      end
+    end
+
+    # Get the state of the specified deployment
+    #
+    # ===== Attributes
+    #
+    # * +rg_name+ - Name of the resource group being deployed to
+    # * +deployment_name+ - Name of the deployment that is currently being processed     
+    def deployment_state(rg_name, deployment_name)
+      deployments = resource_management_client.deployments.get(rg_name, deployment_name)
+      deployments.properties.provisioning_state
+    end    
   end
 end

data/lib/wombat/delete.rb

@@ -1,6 +1,5 @@
 require 'wombat/common'
 require 'aws-sdk'
-require 'ms_rest_azure'
 require 'azure_mgmt_resources'
 
 module Wombat
@@ -8,10 +7,13 @@ module Wombat
     include Wombat::Common
 
     attr_reader :stack, :cloud
+    attr_accessor :resource_management_client
 
     def initialize(opts)
       @stack = opts.stack
       @cloud = opts.cloud.nil? ? "aws" : opts.cloud
+      @remove_all = opts.remove_all.nil? ? false : opts.remove_all
+      @azure_async = opts.azure_async.nil? ? false : opts.azure_async
     end
 
     def start
@@ -34,24 +36,59 @@ module Wombat
 
       when "azure"
 
-        # Create the connection to Azure using the information in the environment variables
-        subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
-        tenant_id = ENV['AZURE_TENANT_ID']
-        client_id = ENV['AZURE_CLIENT_ID']
-        client_secret = ENV['AZURE_CLIENT_SECRET']
-
-        token_provider = MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret)
-        azure_conn = MsRest::TokenCredentials.new(token_provider)
+        # Connect to Azure
+        azure_conn = connect_azure()
 
         # Create a resource client so that the resource group can be deleted
-        resource_management_client = Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
-        resource_management_client.subscription_id = subscription_id
+        @resource_management_client = Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
+        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+
+        # Only delete the entire resource group if it has been explicitly set
+        if (@remove_all) 
+          banner(format("Deleting resource group: %s", stack))
+
+          resource_management_client.resource_groups.begin_delete(stack)
+
+          info "Destroy operation accepted and will continue in the background."
+        else
+        
+          banner(format("Tidying resource group: %s", stack))
+
+          # Create new deployment using the tidy template so that the storage account is left
+          # behind but all the other resources are removed
+          template_file = File.read("#{conf['stack_dir']}/#{stack}.tidy.json")
+
+          # determine the name of the deployment
+          deployment_name = format('deploy-tidy-%s', Time.now().to_i)
 
-        banner(format("Deleting resource group: %s", stack))
+          # Create the deployment definition
+          deployment = Azure::ARM::Resources::Models::Deployment.new
+          deployment.properties = Azure::ARM::Resources::Models::DeploymentProperties.new
+          deployment.properties.mode = Azure::ARM::Resources::Models::DeploymentMode::Complete
+          deployment.properties.template = JSON.parse(template_file)
 
-        resource_management_client.resource_groups.begin_delete(stack)
+          # Perform the deployment to the named resource group
+          begin
+            resource_management_client.deployments.begin_create_or_update_async(stack, deployment_name, deployment).value!
+          rescue MsRestAzure::AzureOperationError => operation_error
+            rest_error = operation_error.body['error']
+            deployment_active = rest_error['code'] == 'DeploymentActive'
+            if deployment_active
+              info format("Deployment for resource group '%s' is ongoing", stack)
+            else
+              warn rest_error
+              raise operation_error
+            end
+          end
 
-        info "Destroy operation accepted and will continue in the background."
+          # Monitor the deployment
+          if @azure_async
+            info "Deployment operation accepted.  Use the Azure Portal to check progress"
+          else
+            info "Removing Automate resources"
+            follow_azure_deployment(stack, deployment_name)
+          end
+        end
       end
     end
   end

data/lib/wombat/deploy.rb

@@ -1,6 +1,5 @@
 require 'wombat/common'
 require 'aws-sdk'
-require 'ms_rest_azure'
 require 'azure_mgmt_resources'
 
 module Wombat
@@ -58,19 +57,13 @@ module Wombat
 
         # determine the name of the deployment
         deployment_name = format('deploy-%s', Time.now().to_i)
-
-        # Create the connection to Azure using the information in the environment variables
-        subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
-        tenant_id = ENV['AZURE_TENANT_ID']
-        client_id = ENV['AZURE_CLIENT_ID']
-        client_secret = ENV['AZURE_CLIENT_SECRET']
-
-        token_provider = MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret)
-        azure_conn = MsRest::TokenCredentials.new(token_provider)
+        
+        # Connect to azure
+        azure_conn = connect_azure()
 
         # Create a resource client so that the template can be deployed
         @resource_management_client = Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
-        @resource_management_client.subscription_id = subscription_id
+        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
 
         # Create the deployment definition
         deployment = Azure::ARM::Resources::Models::Deployment.new
@@ -102,59 +95,7 @@ module Wombat
       end
     end
 
-    # Track the progress of the deployment in Azure
-    #
-    # ===== Attributes
-    #
-    # * +rg_name+ - Name of the resource group being deployed to
-    # * +deployment_name+ - Name of the deployment that is currently being processed
-    def follow_azure_deployment(rg_name, deployment_name)
-
-      end_provisioning_states = 'Canceled,Failed,Deleted,Succeeded'
-      end_provisioning_state_reached = false
-
-      until end_provisioning_state_reached
-        list_outstanding_deployment_operations(rg_name, deployment_name)
-        info ""
-        sleep 10
-        deployment_provisioning_state = deployment_state(rg_name, deployment_name)
-        end_provisioning_state_reached = end_provisioning_states.split(',').include?(deployment_provisioning_state)
-      end
-      info format("Resource Template deployment reached end state of %s", deployment_provisioning_state)
-    end
-
-    # Get a list of the outstanding deployment operations
-    #
-    # ===== Attributes
-    #
-    # * +rg_name+ - Name of the resource group being deployed to
-    # * +deployment_name+ - Name of the deployment that is currently being processed    
-    def list_outstanding_deployment_operations(rg_name, deployment_name)
-      end_operation_states = 'Failed,Succeeded'
-      deployment_operations = resource_management_client.deployment_operations.list(rg_name, deployment_name)
-      deployment_operations.each do |val|
-        resource_provisioning_state = val.properties.provisioning_state
-        unless val.properties.target_resource.nil?
-          resource_name = val.properties.target_resource.resource_name
-          resource_type = val.properties.target_resource.resource_type
-        end
-        end_operation_state_reached = end_operation_states.split(',').include?(resource_provisioning_state)
-        unless end_operation_state_reached
-          info format("resource %s '%s' provisioning status is %s", resource_type, resource_name, resource_provisioning_state)
-        end
-      end
-    end
 
-    # Get the state of the specified deployment
-    #
-    # ===== Attributes
-    #
-    # * +rg_name+ - Name of the resource group being deployed to
-    # * +deployment_name+ - Name of the deployment that is currently being processed     
-    def deployment_state(rg_name, deployment_name)
-      deployments = resource_management_client.deployments.get(rg_name, deployment_name)
-      deployments.properties.provisioning_state
-    end
 
   end
 end

data/lib/wombat/output.rb

@@ -1,18 +1,28 @@
 require 'wombat/common'
 require 'aws-sdk'
+require 'azure_mgmt_network'
 
 module Wombat
   class OutputRunner
     include Wombat::Common
 
-    attr_reader :stack
+    attr_reader :stack, :cloud
+    attr_accessor :network_management_client
 
     def initialize(opts)
       @stack = opts.stack
+      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
     end
 
     def start
-      cfn_workstation_ips(stack)
+
+      # Get the IP addresses for the workstations
+      case cloud
+      when "aws"
+        cfn_workstation_ips(stack)
+      when "azure"
+        azure_workstation_ips(stack)
+      end
     end
 
     private
@@ -42,5 +52,35 @@ module Wombat
       end
       instances
     end
+
+    def azure_workstation_ips(stack)
+
+      # Connect to Azure
+      azure_conn = connect_azure()
+
+      # Create a resource client so that the template can be deployed
+      @network_management_client = Azure::ARM::Network::NetworkManagementClient.new(azure_conn)
+      network_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+
+      # Obtain a list of all the Public IP addresses in the stack
+      public_ip_addresses = network_management_client.public_ipaddresses.list(stack)
+
+      banner(format("Public IP Addresses in '%s'", stack))
+
+      # Check that there are IP addresses in the stack
+      if public_ip_addresses.length == 0
+
+        warn('No public IP addresses')
+
+      else
+
+        # Iterate around the public IP addresses and output each one
+        public_ip_addresses.each do |public_ip_address|
+
+          # Output the details about the IP address
+          puts format("%s:\t%s (%s)", public_ip_address.name, public_ip_address.ip_address, public_ip_address.dns_settings.fqdn)
+        end
+      end
+    end
   end
 end

data/lib/wombat/version.rb

@@ -1,3 +1,3 @@
 module Wombat
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/wombat-cli.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh', '~> 3.2'
   gem.add_dependency 'parallel', '~> 1.9'
   gem.add_dependency 'aws-sdk', '~> 2.5'
-  gem.add_dependency 'azure_mgmt_resources', '~> 0.8'
-  gem.add_dependency 'azure_mgmt_storage', '~> 0.8'
+  gem.add_dependency 'azure_mgmt_resources', '~> 0.9'
+  gem.add_dependency 'azure_mgmt_storage', '~> 0.9'
+  gem.add_dependency 'azure_mgmt_network', '~> 0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andre Elizondo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,28 +87,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_network
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: With a tough barrel-like body, short powerful legs, and long flat claws,
   the wombat walks with a shuffling gait but is extremely adept at tunneling
 email:
@@ -293,6 +307,7 @@ files:
 - generator_files/packer/infranodes.json
 - generator_files/packer/workstation.json
 - generator_files/templates/arm.json.erb
+- generator_files/templates/arm.tidy.json.erb
 - generator_files/templates/bootstrap-aws.erb
 - generator_files/templates/cfn.json.erb
 - generator_files/wombat.yml