Add support for ansible playbooks for bootstrapping #43

chrisipa · Nov 7, 2018 · 1838105 · 1838105
1 parent e4cd68e
commit 1838105
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/modules/cloud-portal-server-base/pom.xml b/modules/cloud-portal-server-base/pom.xml
@@ -90,9 +90,12 @@
                                     <!-- install ansible -->
                                     <run>apt-get install -y --no-install-recommends ansible</run>
 
-                                    <!-- install ansible pysphere package -->
+                                    <!-- install ansible pysphere module -->
                                     <run>pip install pysphere</run>
 
+                                    <!-- install ansible pywinrm module -->
+                                    <run>pip install pywinrm</run>
+
                                     <!-- clear apt cache -->
                                     <run>apt-get clean</run>
 

diff --git a/...les/cloud-portal-server/src/main/java/de/papke/cloud/portal/service/TerraformService.java b/...les/cloud-portal-server/src/main/java/de/papke/cloud/portal/service/TerraformService.java
@@ -34,6 +34,8 @@ public class TerraformService extends ProvisionerService {
 
 	public static final String PREFIX = "terraform";
 
+	private static final String ANSIBLE_USERNAME = "ansible_user";
+	private static final String ANSIBLE_PASSWORD = "ansible_password"; // NOSONAR
 	private static final String ANSIBLE_SSH_USER = "ansible_ssh_user";
 	private static final String ANSIBLE_SSH_PASS = "ansible_ssh_pass"; // NOSONAR
 	private static final String ANSIBLE_SUDO_PASS = "ansible_sudo_pass"; // NOSONAR
@@ -127,7 +129,9 @@ protected void prepare(UseCase useCase, String action, Credentials credentials,
 			credentialsMap.put(ANSIBLE_SSH_PASS, credentialsMap.get(ESXI_PASSWORD));
 		}
 		else {			
+			credentialsMap.put(ANSIBLE_USERNAME, (String) variableMap.get(USERNAME));
 			credentialsMap.put(ANSIBLE_SSH_USER, (String) variableMap.get(USERNAME));
+			credentialsMap.put(ANSIBLE_PASSWORD, (String) variableMap.get(PASSWORD));
 			credentialsMap.put(ANSIBLE_SSH_PASS, (String) variableMap.get(PASSWORD));
 			credentialsMap.put(ANSIBLE_SUDO_PASS, (String) variableMap.get(PASSWORD));
 		}

diff --git a/...loud-portal-server/src/main/resources/usecase/vm-standalone/vsphere/terraform/ansible.cfg b/...loud-portal-server/src/main/resources/usecase/vm-standalone/vsphere/terraform/ansible.cfg
@@ -7,4 +7,4 @@ host_key_checking = False
 deprecation_warnings = False
 
 # hide command warnings
-command_warnings=False
+command_warnings = False
diff --git a/...es/cloud-portal-server/src/main/resources/usecase/vm-standalone/vsphere/terraform/main.tf b/...es/cloud-portal-server/src/main/resources/usecase/vm-standalone/vsphere/terraform/main.tf
@@ -265,12 +265,32 @@ resource "null_resource" "windowsprovisioning" {
 
   provisioner "remote-exec" {
     inline = [
-      "Powershell.exe -ExecutionPolicy Unrestricted -File ${local.windows_prepare_script_path} ${var.random_id}",      
-      "Powershell.exe -ExecutionPolicy Unrestricted -File ${local.windows_user_script_path}",
+      "Powershell.exe -ExecutionPolicy Unrestricted -File ${local.windows_prepare_script_path} ${var.random_id}"      
+    ]
+  } 
+
+  provisioner "remote-exec" {
+    inline = [
+      "Powershell.exe -ExecutionPolicy Unrestricted -File ${local.windows_user_script_path}"
+    ]
+  } 
+
+  provisioner "local-exec" {
+    command = "ansible-galaxy install -c -r ${var.ansible_requirements_file}"
+    on_failure = "continue"
+  } 
+
+  provisioner "local-exec" {
+    command = "ansible-playbook -i ${vsphere_virtual_machine.windows.guest_ip_addresses.0}, -e ansible_port='5985' -e ansible_connection='winrm' -e \"@parameters.yml\" ${var.ansible_playbook_file}"
+    on_failure = "continue"
+  } 
+
+  provisioner "remote-exec" {
+    inline = [
       "Powershell.exe -ExecutionPolicy Unrestricted -File ${local.windows_cleanup_script_path}",
       "Powershell.exe -ExecutionPolicy Unrestricted -Command Remove-Item ${local.windows_script_folder_path} -Force -Recurse"      
     ]
-  } 
+  }   
 
   depends_on = ["vsphere_virtual_machine.windows"]
 }