From 1a85f1344ba17ba82e047109ca75f8f40b0942f1 Mon Sep 17 00:00:00 2001
From: Dave McDermid <dave.mcdermid@wiggle.co.uk>
Date: Tue, 18 Aug 2015 16:05:20 +0100
Subject: [PATCH] Added join_domain feature to Azure Instance resource

---
 .../azure/resource_azure_instance.go          | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go
index cf20e8218..fb264f28e 100644
--- a/builtin/providers/azure/resource_azure_instance.go
+++ b/builtin/providers/azure/resource_azure_instance.go
@@ -170,6 +170,30 @@ func resourceAzureInstance() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"domain_name": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"domain_username": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"domain_password": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"domain_ou": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -273,6 +297,19 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err
 		if err != nil {
 			return fmt.Errorf("Error configuring %s for Windows: %s", name, err)
 		}
+		
+		if domain_name, ok := d.GetOk("domain_name"); ok {
+			err = vmutils.ConfigureWindowsToJoinDomain(
+				&role, 
+				d.Get("domain_username").(string), 
+				d.Get("domain_password").(string), 
+				domain_name.(string), 
+				d.Get("domain_ou").(string),
+			) 
+			if err != nil {
+				return fmt.Errorf("Error configuring %s for WindowsToJoinDomain: %s", name, err)
+			}
+		}
 	}
 
 	if s := d.Get("endpoint").(*schema.Set); s.Len() > 0 {