updated lab

Author: jmassardo

05-a2-forwarder.conf

@@ -4,7 +4,7 @@ resource "azurerm_public_ip" "automate_pubip" {
   location                     = "${var.azure_region}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
   public_ip_address_allocation = "dynamic"
-  domain_name_label            = "${var.automate_server_name}"
+  domain_name_label            = "${var.automate_server_name}-${lower(substr("${join("", split(":", timestamp()))}", 8, -1))}"
 
   tags {
     environment = "${var.azure_env}"
@@ -33,7 +33,6 @@ resource "azurerm_virtual_machine" "automate" {
   resource_group_name   = "${azurerm_resource_group.rg.name}"
   network_interface_ids = ["${azurerm_network_interface.automate_ip.id}"]
   vm_size               = "${var.automate_vm_size}"
-  depends_on            = ["azurerm_virtual_machine.chef"]
 
   storage_image_reference {
     publisher = "Canonical"
@@ -72,46 +71,31 @@ resource "azurerm_virtual_machine" "automate" {
 
   provisioner "file" {
     source      = "labadmin"
-    destination = "/home/labadmin/.ssh/id_rsa"
+    destination = "/home/${var.username}/.ssh/id_rsa"
   }
 
+  provisioner "remote-exec" {
+    inline = [
+      "chmod 700 /home/${var.username}/.ssh/id_rsa",
+    ]
+  }
   provisioner "file" {
     source      = "labadmin.pub"
-    destination = "/home/labadmin/.ssh/authorized_keys"
+    destination = "/home/${var.username}/.ssh/authorized_keys"
   }
 
   provisioner "file" {
     source      = "InstallChefAutomate.sh"
     destination = "/tmp/InstallChefAutomate.sh"
   }
-
-  provisioner "file" {
-    source      = "automate.license"
-    destination = "/tmp/automate.license"
-  }
-
-  provisioner "file" {
-    source      = "05-a2-forwarder.conf"
-    destination = "/tmp/05-a2-forwarder.conf"
-  }
-
-  provisioner "file" {
-    source      = "profiles/"
-    destination = "/tmp"
-  }
-
   provisioner "remote-exec" {
     inline = [
       "sudo chmod +x /tmp/InstallChefAutomate.sh",
-      "sudo /tmp/InstallChefAutomate.sh ${var.automate_server_name} ${var.chef_server_name} ${var.chef_server_user} ${var.chef_server_org_shortname} ${var.automate_server_version} ${var.automate_server_user} ${var.automate_server_user_password} ${var.azure_region} ${var.username} ${var.inspec_version} > install.log",
+      "sudo /tmp/InstallChefAutomate.sh ${azurerm_public_ip.automate_pubip.fqdn} ${azurerm_public_ip.chef_pubip.fqdn}",
     ]
   }
 }
 
-# output "aip" {
-#   value = "${azurerm_public_ip.automate_pubip.ip_address}"
-# }
-
 output "afqdn" {
   value = "${azurerm_public_ip.automate_pubip.fqdn}"
 }

Automate2Server.tf

@@ -2,7 +2,7 @@
 
 # Create a resource group to contain all the objects
 resource "azurerm_resource_group" "rg" {
-  name     = "${var.azure_rg_name}"
+  name     = "${var.azure_rg_name}-${join("", split(":", timestamp()))}" #Removing the colons since Azure doesn't allow them.
   location = "${var.azure_region}"
 }
 
@@ -14,15 +14,15 @@ resource "azurerm_virtual_network" "vnet" {
   resource_group_name = "${azurerm_resource_group.rg.name}"
 }
 
-# Create the individual subnet for the web servers
+# Create the individual subnet for the servers
 resource "azurerm_subnet" "subnet" {
   name                 = "${var.azure_rg_name}_Subnet"
   resource_group_name  = "${azurerm_resource_group.rg.name}"
   virtual_network_name = "${azurerm_virtual_network.vnet.name}"
   address_prefix       = "10.1.1.0/24"
 }
 
-# create the network security group to allow inbound access to the server
+# create the network security group to allow inbound access to the servers
 resource "azurerm_network_security_group" "nsg" {
   name                = "${var.azure_rg_name}_nsg"
   location            = "${var.azure_region}"

AutomateServer.tf

@@ -5,7 +5,7 @@ resource "azurerm_public_ip" "node_pubip" {
   location                     = "${var.azure_region}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
   public_ip_address_allocation = "dynamic"
-  domain_name_label            = "jm-node${count.index}"
+  domain_name_label            = "node${count.index}-${lower(substr("${join("", split(":", timestamp()))}", 8, -1))}"
 
   tags {
     environment = "${var.azure_env}"
@@ -22,9 +22,9 @@ resource "azurerm_network_interface" "node_ip" {
   ip_configuration {
     name                          = "node${count.index}_ipconf"
     subnet_id                     = "${azurerm_subnet.subnet.id}"
-    private_ip_address_allocation = "dynamic"
-
-    # public_ip_address_id          = ["${element(azurerm_public_ip.node_pubip.*.id, count.index)}"]
+    private_ip_address_allocation = "static"
+    private_ip_address            = "${cidrhost("10.1.1.20/24", 20+count.index)}"
+    public_ip_address_id          = "${element(azurerm_public_ip.node_pubip.*.id, count.index + 1)}"
   }
 }
 
@@ -36,7 +36,7 @@ resource "azurerm_virtual_machine" "node" {
   resource_group_name   = "${azurerm_resource_group.rg.name}"
   network_interface_ids = ["${element(azurerm_network_interface.node_ip.*.id, count.index)}"]
   vm_size               = "${var.chef_node_vm_size}"
-  depends_on            = ["azurerm_virtual_machine.automate2"]
+  depends_on            = ["azurerm_virtual_machine.chef"]
 
   storage_image_reference {
     publisher = "Canonical"
@@ -53,7 +53,7 @@ resource "azurerm_virtual_machine" "node" {
   }
 
   os_profile {
-    computer_name  = "jm-tr-node${count.index}"
+    computer_name  = "node${count.index}"
     admin_username = "${var.username}"
     admin_password = "${var.password}"
   }
@@ -66,26 +66,26 @@ resource "azurerm_virtual_machine" "node" {
     environment = "${var.azure_env}"
   }
 
-  # connection {
+  connection {
+    host     = "${element(azurerm_public_ip.node_pubip.*.fqdn, count.index + 1)}"
+    type     = "ssh"
+    user     = "${var.username}"
+    password = "${var.password}"
+  }
 
-  #   host     = ["${element(azurerm_public_ip.node.*._pubip.fqdn, count.index)}"]
-  #   type     = "ssh"
-  #   user     = "${var.username}"
-  #   password = "${var.password}"
-  # }
+  provisioner "file" {
+    source      = "labadmin"
+    destination = "/home/${var.username}/.ssh/id_rsa"
+  }
 
-  # provisioner "file" {
-  #   source      = "labadmin"
-  #   destination = "/home/labadmin/.ssh/id_rsa"
-  # }
+  provisioner "remote-exec" {
+    inline = [
+      "chmod 700 /home/${var.username}/.ssh/id_rsa",
+    ]
+  }
 
-  # provisioner "file" {
-  #   source      = "labadmin.pub"
-  #   destination = "/home/labadmin/.ssh/authorized_keys"
-  # }
+  provisioner "file" {
+    source      = "labadmin.pub"
+    destination = "/home/${var.username}/.ssh/authorized_keys"
+  }
 }
-
-# output "node${count.index}fqdn" {
-#   value = ["${element(azurerm_public_ip.node.*._pubip.fqdn, count.index)}"]
-# }
-

AzureInfrastructure.tf

@@ -4,7 +4,7 @@ resource "azurerm_public_ip" "chef_pubip" {
   location                     = "${var.azure_region}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
   public_ip_address_allocation = "dynamic"
-  domain_name_label            = "${var.chef_server_name}"
+  domain_name_label            = "${var.chef_server_name}-${lower(substr("${join("", split(":", timestamp()))}", 8, -1))}"
 
   tags {
     environment = "${var.azure_env}"
@@ -20,10 +20,8 @@ resource "azurerm_network_interface" "chef_ip" {
   ip_configuration {
     name      = "chef_ipconf"
     subnet_id = "${azurerm_subnet.subnet.id}"
-
-    # private_ip_address_allocation = "dynamic"
     private_ip_address_allocation = "static"
-    private_ip_address            = "10.1.1.10"                          # "${cidrhost(10.1.1.0/24, 10)}"
+    private_ip_address            = "10.1.1.10"
     public_ip_address_id          = "${azurerm_public_ip.chef_pubip.id}"
   }
 }
@@ -35,6 +33,7 @@ resource "azurerm_virtual_machine" "chef" {
   resource_group_name   = "${azurerm_resource_group.rg.name}"
   network_interface_ids = ["${azurerm_network_interface.chef_ip.id}"]
   vm_size               = "${var.chef_vm_size}"
+  depends_on            = ["azurerm_virtual_machine.automate"]
 
   storage_image_reference {
     publisher = "Canonical"
@@ -73,12 +72,18 @@ resource "azurerm_virtual_machine" "chef" {
 
   provisioner "file" {
     source      = "labadmin"
-    destination = "/home/labadmin/.ssh/id_rsa"
+    destination = "/home/${var.username}/.ssh/id_rsa"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "chmod 700 /home/${var.username}/.ssh/id_rsa",
+    ]
   }
 
   provisioner "file" {
     source      = "labadmin.pub"
-    destination = "/home/labadmin/.ssh/authorized_keys"
+    destination = "/home/${var.username}/.ssh/authorized_keys"
   }
 
   provisioner "file" {
@@ -89,7 +94,7 @@ resource "azurerm_virtual_machine" "chef" {
   provisioner "remote-exec" {
     inline = [
       "sudo chmod +x /tmp/InstallChefServer.sh",
-      "sudo /tmp/InstallChefServer.sh ${var.automate_server_name} ${var.azure_region} ${var.chef_server_name} ${var.chef_server_version} ${var.chef_server_user} ${var.chef_server_user_password} ${var.chef_server_user_firstname} ${var.chef_server_user_lastname} ${var.chef_server_user_email} ${var.chef_server_org_shortname} '${var.chef_server_org_fullname}' ${var.chef_server_install_pushjobs} ${var.chef_server_pushjobs_version} ${var.chef_server_install_manage} ${var.chef_server_manage_version} ${var.chefdk_version} > install.log ",
+      "sudo /tmp/InstallChefServer.sh ${azurerm_public_ip.automate_pubip.fqdn} ${azurerm_public_ip.chef_pubip.fqdn} ${var.chef_server_version} ${var.username} ${var.password} ${var.chef_server_user_firstname} ${var.chef_server_user_lastname} ${var.chef_server_user_email} ${var.chef_server_org_shortname} '${var.chef_server_org_fullname}' ${var.chef_server_install_pushjobs} ${var.chef_server_pushjobs_version} ${var.chef_server_install_manage} ${var.chef_server_manage_version} ${var.chefdk_version} > install.log ",
     ]
   }
 }