avst-cloud 0.1.14 → 0.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZhMjQwZjMyYjg1Y2I1OTQ4MWViOWZmZDNhOWZhZTMyOTEwYzBkYw==
+    MzFkODdkZDM1M2NiZTcxNDkxMTEzN2E3N2U5OWU3NjE1NTU0ZDE3OQ==
   data.tar.gz: !binary |-
-    NjUzMWY4MTg1ZDdhZWZhM2JiMjdhYTZiMDc3YjlhZWJkOTBiNzEyNw==
+    MjUyZTIwYzMyNTA1Mzk1MGZjZWYxZTU5MzQ1OTk4MDY1MmNmNWZjNA==
 SHA512:
   metadata.gz: !binary |-
-    NjRkZTQ4NmUwNjQxNzA2OWJkMTNiNGRmYTk0ZTQ0YzM0MzVmYjEyYjZjMDc5
-    Y2FhOTAwMmE2MTE5OGFlOWE4NzYzZjVhODJlOTQzZDUzYTMwMDhhNTVmYTE4
-    YjRkYjQ3MmI5N2NlNTY5MTczMDQ3OGQ4YjVkYmE0MzA4NDJjMTY=
+    MjM5ZTZjY2RhZjMzNDliOGVmMDBhNzljOWNiODY0MDhjZmJmZmJhMzZmMWU1
+    NTk3YTdmOWYyYzVjMTgzZDZhODIyNGJlMTAxYThhMzc2NmZjNjVhNjk2YTA5
+    ZWRjYzgwODc1OTViYzM0OTljYzM1ZGVlNjJhZjgyY2ZjOWZhNDI=
   data.tar.gz: !binary |-
-    YzllYTEzYzgyYTcyOWVjOGFhMjA5YWM0MjVkZTRjZWQ1MzYyNTlmM2JiYzc4
-    ZjliY2ZjOTRiZmI2NzQ4YzlmYzM3OGZjODAyZDkwNmQ4ZTZiZTAwM2I4ODYx
-    OTk4MzBkZDhmYmExYzRlMDBmMzMxNTFkOWY2M2FmZjBjNzIzYTg=
+    NTFlOTI3ZDYyZWQ0NTdjYzNhMjRkYzA2NGNhNDk2Yzc0MzUyN2IzYzU3OWNm
+    MTgzMjNiODE4NzA2NTc5ZTY3NmZmODkyZDA5Mzg4YjI5ZWQ5YjY0YTUyOWVm
+    Zjc3ZmY1NDlhYTEzZGY3YjVhOTcyNDY0MWI4MzMzZmZkOTllNWY=

data/avst-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
     spec.name          = "avst-cloud"
-    spec.version       = '0.1.14'
+    spec.version       = '0.1.17'
     spec.authors       = ["Martin Brehovsky", "Jon Bevan", "Matthew Hope"]
     spec.email         = ["mbrehovsky@adaptavist.com", "jbevan@adaptavist.com", "mhope@adaptavist.com"]
     spec.summary       = %q{Automated creation, bootstrapping and provisioning of servers }
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "rake"
     spec.add_dependency "fog"
     spec.add_dependency "fog-azure"
-    spec.add_dependency "fog-azure-rm"
+    spec.add_dependency "fog-azure-rm", "0.0.3"
     spec.add_dependency "azure"
     spec.add_dependency "capistrano", "3.2.1"
     spec.add_dependency "capistrano-rvm"

data/bin/avst-cloud-azure-rm

@@ -35,7 +35,7 @@ publisher = 'Canonical'
 offer = 'UbuntuServer'
 sku = '14.04.2-LTS'
 version = 'latest'
-
+platform = nil # defaults to Linux
 server_name = "hostname1"
 user = "ubuntu"
 # Must comply to Azure pass guidelines
@@ -55,6 +55,7 @@ dns_list = nil
 network_address_list = nil
 address_prefix  = nil
 use_public_ip = true # will return public ip, if set to false, private will be used by bootstrap
+create_public_ip_configuration = true # in case you do not want to create public ip config set to false, ip_configuration_name needs to be set anyway, defaults to true
 serv = conn.create_server(server_name, 
             user, 
             password,
@@ -62,7 +63,8 @@ serv = conn.create_server(server_name,
             offer,
             sku,
             version, 
-            location, 
+            platform,
+            location,
             resource_group, 
             vm_size, 
             storage_account_name, 
@@ -76,7 +78,8 @@ serv = conn.create_server(server_name,
             dns_list, 
             network_address_list, 
             address_prefix,
-            use_public_ip)
+            use_public_ip,
+            create_public_ip_configuration)
 
 # serv = conn.server(server_name, resource_group ,user, password)
 # puts serv.inspect

data/lib/avst-cloud/azure_rm_connection.rb

@@ -27,7 +27,7 @@ module AvstCloud
             @subscription_id = subscription_id
         end
         
-        def server(server_name, resource_group, root_user, root_password, use_public_ip=true)
+        def server(server_name, resource_group, root_user, root_password, use_public_ip=true, network_interface_resource_group=nil, public_ip_resource_group=nil )
             server = find_fog_server(server_name, resource_group)
             if !root_user
                 root_user = get_root_user
@@ -35,22 +35,24 @@ module AvstCloud
             ip_address = nil
             if (server.network_interface_card_id)
                 network_interface_card_name = server.network_interface_card_id.split("/")[-1]
-                nic = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_card_name)
+                network_interface_resource_group = resource_group unless network_interface_resource_group
+                nic = connect_to_networks.network_interfaces(resource_group: network_interface_resource_group).get(network_interface_card_name)
                 if nic
                     if use_public_ip
                         if nic.public_ip_address_id
                             ip_configuration_name = nic.public_ip_address_id.split("/")[-1]
-                            pip = connect_to_networks.public_ips(resource_group: resource_group).get(ip_configuration_name)
+                            public_ip_resource_group = network_interface_resource_group unless public_ip_resource_group
+                            pip = connect_to_networks.public_ips(resource_group: public_ip_resource_group).get(ip_configuration_name)
                             ip_address = pip.ip_address
                         else
-                            logger.debug "Can not find public ip for server #{server_name} in resource_group #{resource_group}"
+                            logger.debug "Can not find public ip for server #{server_name} in resource_group #{public_ip_resource_group}"
                             raise "Can not find public ip"
                         end
                     else
                         ip_address = nic.private_ip_address
                     end
                 else
-                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{resource_group}"
+                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{network_interface_resource_group}"
                     raise "Can not find network interface card"
                 end
             else 
@@ -68,6 +70,7 @@ module AvstCloud
             offer,
             sku,
             version,
+            platform,
             location, 
             resource_group, 
             vm_size, 
@@ -82,12 +85,19 @@ module AvstCloud
             dns_list, 
             network_address_list, 
             address_prefix,
-            use_public_ip)
+            use_public_ip,
+            create_public_ip_configuration,
+            storage_account_resource_group=nil,
+            virtual_network_resource_group=nil, 
+            network_interface_resource_group=nil, 
+            public_ip_resource_group=nil,
+            subnet_resource_group=nil
+            )
 
             location = location || 'West Europe'
             user = user || get_root_user
             vm_size = vm_size || "Basic_A0"
-            
+            platform = platform || "Linux"
             # Check that resource_group exists if not create one
             check_create_resource_group(resource_group, location)
             
@@ -108,13 +118,26 @@ module AvstCloud
                 logger.debug "offer                - #{offer}"
                 logger.debug "sku                  - #{sku}"
                 logger.debug "version              - #{version}"
+                logger.debug "platform             - #{platform}"
+
+                storage_account_resource_group = resource_group unless storage_account_resource_group
+                virtual_network_resource_group = resource_group unless virtual_network_resource_group
+                network_interface_resource_group = virtual_network_resource_group unless network_interface_resource_group
+                public_ip_resource_group = virtual_network_resource_group unless public_ip_resource_group
+                subnet_resource_group = virtual_network_resource_group unless subnet_resource_group
+
+                logger.debug "storage_account_resource_group   - #{storage_account_resource_group}"
+                logger.debug "network_interface_resource_group - #{network_interface_resource_group}"
+                logger.debug "virtual_network_resource_group   - #{virtual_network_resource_group}"
+                logger.debug "public_ip_resource_group         - #{public_ip_resource_group}"
+                logger.debug "subnet_resource_group            - #{subnet_resource_group}"
 
                 # Check that storage_account exists if not create one
-                check_create_storage_account(storage_account_name, location, resource_group)
+                check_create_storage_account(storage_account_name, location, storage_account_resource_group)
                 
                 # Check if network_interface_card_id exists if not create one
                 # If not, create one for virtual network provided with subnet, security group and also public ip name
-                ip_address = check_create_network_interface(network_interface_name, resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method, public_ip_allocation_method, subnet_address_list, dns_list, network_address_list, address_prefix, use_public_ip)
+                ip_address = check_create_network_interface(network_interface_name, network_interface_resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method, public_ip_allocation_method, subnet_address_list, dns_list, network_address_list, address_prefix, use_public_ip, create_public_ip_configuration, virtual_network_resource_group, public_ip_resource_group, subnet_resource_group)
                 
                 # create server
                 server = connect.servers.create(
@@ -126,11 +149,12 @@ module AvstCloud
                     username: user,
                     password: password,
                     disable_password_authentication: false,
-                    network_interface_card_id: "/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/#{network_interface_name}",
+                    network_interface_card_id: "/subscriptions/#{@subscription_id}/resourceGroups/#{network_interface_resource_group}/providers/Microsoft.Network/networkInterfaces/#{network_interface_name}",
                     publisher: publisher,
                     offer: offer,
                     sku: sku,
-                    version: version
+                    version: version,
+                    platform: platform
                 )
                 
                 result_server = AvstCloud::AzureRmServer.new(server, server_name, ip_address, user, password)
@@ -147,18 +171,27 @@ module AvstCloud
             logger.debug "#{storage_acc.inspect}"
         end
 
-        def check_create_network_interface(network_interface_name, resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method="Dynamic", public_ip_allocation_method="Static", subnet_address_list=nil, dns_list=nil, network_address_list=nil, address_prefix=nil, use_public_ip=true)
+        def check_create_network_interface(network_interface_name, resource_group, location, virtual_network_name, subnet_name, ip_configuration_name, private_ip_allocation_method="Dynamic", public_ip_allocation_method="Static", subnet_address_list=nil, dns_list=nil, network_address_list=nil, address_prefix=nil, use_public_ip=true, create_public_ip_configuration=true, virtual_network_resource_group=nil, public_ip_resource_group=nil, subnet_resource_group=nil)
             nic = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_name)
         
             # check/create ip_configuration_name exists
-            public_ip = check_create_ip_configuration(ip_configuration_name, resource_group, location, public_ip_allocation_method)
+            if create_public_ip_configuration
+                public_ip_resource_group = resource_group unless public_ip_resource_group
+                public_ip = check_create_ip_configuration(ip_configuration_name, public_ip_resource_group, location, public_ip_allocation_method)
+                public_ip_address_id =  "/subscriptions/#{@subscription_id}/resourceGroups/#{public_ip_resource_group}/providers/Microsoft.Network/publicIPAddresses/#{ip_configuration_name}"
+            else
+                use_public_ip = false
+            end
             unless nic
+                # default virtual_network_resource_group to network interface resource group
+                virtual_network_resource_group = resource_group unless virtual_network_resource_group
                 # check/create  virtual_network exists
-                vnet = check_create_virtual_network(virtual_network_name, resource_group, location, subnet_address_list, dns_list, network_address_list)
+                vnet = check_create_virtual_network(virtual_network_name, virtual_network_resource_group, location, subnet_address_list, dns_list, network_address_list)
                 
+                subnet_resource_group = virtual_network_resource_group unless subnet_resource_group
                 # check if provided subnet exists, if nil then use default one
-                unless subnet_name                    
-                    subnets = connect_to_networks.subnets(resource_group: resource_group, virtual_network_name: virtual_network_name)
+                unless subnet_name
+                    subnets = connect_to_networks.subnets(resource_group: subnet_resource_group, virtual_network_name: virtual_network_name)
                     if subnets.length == 0
                         raise "Can not decide what subnet to choose. There are no subnets for virtual network #{virtual_network_name}."
                     elsif subnets.length != 1
@@ -167,16 +200,16 @@ module AvstCloud
                     subnet_name = subnets[0].name
                     logger.debug "Using subnet #{subnet_name}"
                 end
-                
                 nic = connect_to_networks.network_interfaces.create(
                     name: network_interface_name,
                     resource_group: resource_group,
                     location: location,
-                    subnet_id: "/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/#{subnet_name}",
-                    public_ip_address_id: "/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/publicIPAddresses/#{ip_configuration_name}",
+                    subnet_id: "/subscriptions/#{@subscription_id}/resourceGroups/#{subnet_resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/#{subnet_name}",
+                    public_ip_address_id: public_ip_address_id,
                     ip_configuration_name: ip_configuration_name,
                     private_ip_allocation_method: private_ip_allocation_method
                 )
+
             end
             if use_public_ip
                 public_ip
@@ -185,12 +218,13 @@ module AvstCloud
             end
         end
         
-        def find_network_interface_for_server(server_name, resource_group, should_fail=false)
+        def find_network_interface_for_server(server_name, resource_group, should_fail=false, network_interface_resource_group=nil)
             server = find_fog_server(server_name, resource_group)
             network_interface = nil
             if (server and server.network_interface_card_id)
                 network_interface_card_name = server.network_interface_card_id.split("/")[-1]
-                network_interface = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_card_name)
+                network_interface_resource_group = resource_group unless network_interface_resource_group
+                network_interface = connect_to_networks.network_interfaces(resource_group: network_interface_resource_group).get(network_interface_card_name)
             else
                 logger.debug "Can not find network interface card for server #{server_name} in resource_group #{resource_group}"
                 raise "Can not find network interface card" if should_fail 
@@ -240,21 +274,23 @@ module AvstCloud
             logger.debug "Public IP deleted"
         end
 
-        def destroy_ip_configuration_for_server(server_name, resource_group, should_fail=false)
+        def destroy_ip_configuration_for_server(server_name, resource_group, should_fail=false, network_interface_resource_group=nil, public_ip_resource_group=nil)
             server = find_fog_server(server_name, resource_group)
             if (server.network_interface_card_id)
                 network_interface_card_name = server.network_interface_card_id.split("/")[-1]
-                nic = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_card_name)
+                network_interface_resource_group = resource_group unless network_interface_resource_group
+                nic = connect_to_networks.network_interfaces(resource_group: network_interface_resource_group).get(network_interface_card_name)
                 if nic
                     if nic.public_ip_address_id
                         ip_configuration_name = nic.public_ip_address_id.split("/")[-1]
-                        destroy_ip_configuration(ip_configuration_name, resource_group)
+                        public_ip_resource_group = network_interface_resource_group unless public_ip_resource_group
+                        destroy_ip_configuration(ip_configuration_name, public_ip_resource_group)
                     else
-                        logger.debug "Can not find public ip for server #{server_name} in resource_group #{resource_group}"
+                        logger.debug "Can not find public ip for server #{server_name} in resource_group #{network_interface_resource_group}"
                         raise "Can not find public ip" if should_fail
                     end
                 else
-                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{resource_group}"
+                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{network_interface_resource_group}"
                     raise "Can not find network interface card" if should_fail
                 end
             else 
@@ -286,22 +322,24 @@ module AvstCloud
             logger.debug "Subnet deleted"
         end
 
-        def destroy_subnet_for_server(server_name, resource_group, should_fail=false)
+        def destroy_subnet_for_server(server_name, resource_group, should_fail=false, network_interface_resource_group=nil, subnet_resource_group=nil)
             server = find_fog_server(server_name, resource_group)
             if (server.network_interface_card_id)
                 network_interface_card_name = server.network_interface_card_id.split("/")[-1]
-                nic = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_card_name)
+                network_interface_resource_group = resource_group unless network_interface_resource_group
+                nic = connect_to_networks.network_interfaces(resource_group: network_interface_resource_group).get(network_interface_card_name)
                 if nic
                     if nic.subnet_id
                         subnet_id_name = nic.subnet_id.split("/")[-1]
                         virtual_network_name = nic.subnet_id.split("virtualNetworks/")[-1].split("/")[0]
+                        subnet_resource_group = network_interface_resource_group unless subnet_resource_group
                         destroy_subnet(subnet_id_name, resource_group, virtual_network_name)
                     else
-                        logger.debug "Can not find subnet for server #{server_name} in resource_group #{resource_group}"
+                        logger.debug "Can not find subnet for server #{server_name} in resource_group #{network_interface_resource_group}"
                         raise "Can not find subnet" if should_fail
                     end
                 else
-                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{resource_group}"
+                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{network_interface_resource_group}"
                     raise "Can not find network interface card" if should_fail
                 end
             else 
@@ -330,21 +368,23 @@ module AvstCloud
             vnet
         end
 
-        def destroy_virtual_network_for_server(server_name, resource_group, should_fail=false)
+        def destroy_virtual_network_for_server(server_name, resource_group, should_fail=false, network_interface_resource_group=nil, subnet_resource_group=nil)
             server = find_fog_server(server_name, resource_group)
             if (server.network_interface_card_id)
                 network_interface_card_name = server.network_interface_card_id.split("/")[-1]
-                nic = connect_to_networks.network_interfaces(resource_group: resource_group).get(network_interface_card_name)
+                network_interface_resource_group = resource_group unless network_interface_resource_group
+                nic = connect_to_networks.network_interfaces(resource_group: network_interface_resource_group).get(network_interface_card_name)
                 if nic
                     if nic.subnet_id
                         virtual_network_name = nic.subnet_id.split("virtualNetworks/")[-1].split("/")[0]
+                        subnet_resource_group = virtual_network_resource_group unless subnet_resource_group
                         destroy_virtual_network(virtual_network_name, resource_group)
                     else
-                        logger.debug "Can not find virtual network for server #{server_name} in resource_group #{resource_group}"
+                        logger.debug "Can not find virtual network for server #{server_name} in resource_group #{virtual_network_resource_group}"
                         raise "Can not find subnet" if should_fail
                     end
                 else
-                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{resource_group}"
+                    logger.debug "Can not find network interface card for server #{server_name} in resource_group #{virtual_network_resource_group}"
                     raise "Can not find network interface card" if should_fail
                 end
             else 
@@ -381,14 +421,22 @@ module AvstCloud
             if (server and server.storage_account_name)
                 storage_account_name = server.storage_account_name
             end
+            # storage account name not provided as part of server, trying to get it from os_disk_vhd_uri
+            unless storage_account_name
+                if server.os_disk_vhd_uri != nil
+                    # os_disk_vhd_uri="http://storage_account_name.blob.core.windows.net/vhds/servername_os_disk.vhd"
+                    storage_account_name = server.os_disk_vhd_uri.split(".")[0].split("/")[-1]
+                end
+            end
             storage_account_name
         end
 
-        def destroy_storage_account_for_server(server_name, resource_group, should_fail=false)
+        def destroy_storage_account_for_server(server_name, resource_group, should_fail=false, storage_account_resource_group=nil)
             server = find_fog_server(server_name, resource_group)
             if (server.storage_account_name)
                 storage_account_name = server.storage_account_name
-                destroy_storage_account(storage_account_name, resource_group)
+                storage_account_resource_group = resource_group unless storage_account_resource_group
+                destroy_storage_account(storage_account_name, storage_account_resource_group)
             else 
                 logger.debug "Can not find storage account for server #{server_name} in resource_group #{resource_group}"
                 raise "Can not find storage account" if should_fail

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avst-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.17
 platform: ruby
 authors:
 - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,16 +72,16 @@ dependencies:
   name: fog-azure-rm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: azure
   requirement: !ruby/object:Gem::Requirement