Add option to choose between public and private vm ip

README.md

@@ -28,6 +28,7 @@ Mapping and filter settings
 * **Mapping Params**: Custom mapping settings. Property mapping definitions. Specify multiple mappings in the form "attributeName.selector=selector" or "attributeName.default=value", separated by ";"
 * **Resource Group**:  Filter using resource group
 * **Only Running Instances**: Filter for the "Running" instances. If false, all instances will be returned.
+* **Use Private Ip**: If enabled, populate node hostname with private ip otherwise public ip is used.
 
 ### Mapping
 

src/main/groovy/com/rundeck/plugins/azure/azure/AzureManager.groovy

@@ -26,6 +26,7 @@ class AzureManager {
     boolean onlyRunningInstances
     boolean debug
     boolean useAzureTags
+    boolean usePrivateIp
 
     Azure azure
 
@@ -92,7 +93,7 @@ class AzureManager {
             VirtualMachineSize size = azure.virtualMachines().sizes().listByRegion(virtualMachine.region()).find{ size-> size.name().equals(virtualMachine.size().toString())}
 
 
-            AzureNode azureNode = new AzureNode(virtualMachine,size, useAzureTags)
+            AzureNode azureNode = new AzureNode(virtualMachine,size, useAzureTags, usePrivateIp)
 
             if(debug){
                 println ("--------- VM Mapping result ---------------")

src/main/groovy/com/rundeck/plugins/azure/azure/AzureManagerBuilder.groovy

@@ -20,6 +20,7 @@ class AzureManagerBuilder {
     boolean onlyRunningInstances
     Region region
     boolean useAzureTags
+    boolean usePrivateIp
 
     boolean debug
 
@@ -109,6 +110,15 @@ class AzureManagerBuilder {
         return this
     }
 
+    /**
+     * @param usePrivateIp Use private ip
+     * @return this builder
+     */
+    AzureManagerBuilder usePrivateIp(boolean usePrivateIp){
+        this.usePrivateIp = usePrivateIp
+        return this
+    }
+
     /**
      * @param region the region to filter machines
      * @return this builder
@@ -161,6 +171,7 @@ class AzureManagerBuilder {
         azure.setTagName(this.tagName)
         azure.setTagValue(this.tagValue)
         azure.setUseAzureTags(this.useAzureTags)
+        azure.setUsePrivatecIp(this.usePrivateIp)
 
         return azure
     }

src/main/groovy/com/rundeck/plugins/azure/azure/AzureNode.groovy

@@ -25,7 +25,7 @@ class AzureNode {
 
     }
 
-    AzureNode(VirtualMachine vm, VirtualMachineSize size, boolean useAzureTags) {
+    AzureNode(VirtualMachine vm, VirtualMachineSize size, boolean useAzureTags, boolean usePrivateIp) {
 
         this.size = size
         //basic attributes
@@ -38,7 +38,11 @@ class AzureNode {
 
         this.username = vm.osProfile()?.adminUsername()
 
-        this.hostname = vm.getPrimaryPublicIPAddress()?.ipAddress()
+        if (usePrivateIp) {
+            this.hostname = vm.primaryNetworkInterface.primaryPrivateIP()
+        } else {
+            this.hostname = vm.getPrimaryPublicIPAddress()?.ipAddress()
+        }
 
         if(this.hostname==null){
             //the offline machines doesn't have a IP selected

src/main/groovy/com/rundeck/plugins/azure/plugin/AzureResourceModelSource.groovy

@@ -48,6 +48,7 @@ class AzureResourceModelSource  implements ResourceModelSource {
         String tagValue=configuration.getProperty(AzureResourceModelSourceFactory.TAG_VALUE)
         String extraMapping=configuration.getProperty(AzureResourceModelSourceFactory.EXTRA_MAPPING)
         boolean useAzureTags=Boolean.parseBoolean(configuration.getProperty(AzureResourceModelSourceFactory.USE_AZURE_TAGS))
+        boolean usePrivateIp=Boolean.parseBoolean(configuration.getProperty(AzureResourceModelSourceFactory.USE_PRIVATE_IP))
         String keyStoragePath=configuration.getProperty(AzureResourceModelSourceFactory.KEY_STORAGE_PATH)
 
         if(keyStoragePath){
@@ -75,6 +76,7 @@ class AzureResourceModelSource  implements ResourceModelSource {
                     .tagValue(tagValue)
                     .debug(debug)
                     .useAzureTags(useAzureTags)
+                    .usePrivateIp(usePrivateIp)
                     .build()
         }
 

src/main/groovy/com/rundeck/plugins/azure/plugin/AzureResourceModelSourceFactory.groovy

@@ -47,6 +47,7 @@ class AzureResourceModelSourceFactory implements ResourceModelSourceFactory,Desc
     public static final String TAG_VALUE = "tagValue"
     public static final String RUNNING_ONLY = "onlyRunningInstances"
     public static final String USE_AZURE_TAGS = "useAzureTags"
+    public static final String USE_PRIVATE_IP = "usePrivateIp"
 
     public static final String DEBUG = "debugVm"
 
@@ -99,6 +100,10 @@ class AzureResourceModelSourceFactory implements ResourceModelSourceFactory,Desc
             .property(PropertyUtil.bool(USE_AZURE_TAGS, "Use Azure Tags",
                     "If this option is enabled, azure tags will be exporting as Rundeck node tags.",
                     false, "false", null,renderingOptionsConfig))
+            .property(PropertyUtil.bool(USE_PRIVATE_IP, "Use Private IP",
+                    "If this option is enabled, hostname will be populated with private ip, " + 
+                    "otherwise public ip will be used.",
+                    false, "false", null,renderingOptionsConfig))
             .build()
 
     @Override