lots o changes for A2

Author: jmassardo

.DS_Store

@@ -0,0 +1,2 @@
+{
+}

.vscode/settings.json

@@ -0,0 +1,37 @@
+filter {
+  ruby {
+    init => "
+             require 'net/http'
+             require 'uri'
+             require 'json'
+             require 'openssl'
+	    "
+    code => "
+	     automate_url = 'https://automate2.lab.local/data-collector/v0'
+             automate_token = '9nPsVHKuVw6qVkxJYuTJBjNSO6g='
+             #Max size of rabbitmq queues in bytes, if exceeded stop sending data to a2
+             rabbit_max_queue = 1000000 #1GB
+             uri = URI.parse(automate_url)
+
+             # Verify Automate ingest is not backed up
+             queue_size = `du -s /var/opt/delivery/rabbitmq/db/`.split.first.to_i
+             if (queue_size > rabbit_max_queue) then
+               puts %{queue_size: #{queue_size} exceeds rabbit_max_queue: #{rabbit_max_queue} disabling a2 forwarding}
+             else
+               # Create the HTTP objects
+               http = Net::HTTP.new(uri.host, uri.port)
+               http.use_ssl = true
+               http.open_timeout = 5
+               http.read_timeout = 10
+               http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+               headers = {'X-Data-Collector-Token'=> automate_token, 'X-Data-Collector-Auth'=> 'version=1.0', 'Content-Type'=> 'application/json'}
+               request = Net::HTTP::Post.new(uri.request_uri, headers)
+               request.body = event.to_json
+
+               # Send the request
+               response = http.request(request)
+      	       puts %{#{response.body}\n#{response.code}} unless response.code.match(/2[0-9]{2}/)
+             end
+	    "
+  }
+}

05-a2-forwarder.conf

@@ -0,0 +1,107 @@
+#create a public IP address for the virtual machine
+resource "azurerm_public_ip" "automate2_pubip" {
+  name                         = "automate2_pubip"
+  location                     = "${var.azure_region}"
+  resource_group_name          = "${azurerm_resource_group.rg.name}"
+  public_ip_address_allocation = "dynamic"
+  domain_name_label            = "${var.automate2_server_name}"
+
+  tags {
+    environment = "${var.azure_env}"
+  }
+}
+
+#create the network interface and put it on the proper vlan/subnet
+resource "azurerm_network_interface" "automate2_ip" {
+  name                = "automate2_ip"
+  location            = "${var.azure_region}"
+  resource_group_name = "${azurerm_resource_group.rg.name}"
+
+  ip_configuration {
+    name                          = "automate2_ipconf"
+    subnet_id                     = "${azurerm_subnet.subnet.id}"
+    private_ip_address_allocation = "static"
+    private_ip_address            = "10.1.1.12"
+    public_ip_address_id          = "${azurerm_public_ip.automate2_pubip.id}"
+  }
+}
+
+#create the actual VM
+resource "azurerm_virtual_machine" "automate2" {
+  name                  = "automate2"
+  location              = "${var.azure_region}"
+  resource_group_name   = "${azurerm_resource_group.rg.name}"
+  network_interface_ids = ["${azurerm_network_interface.automate2_ip.id}"]
+  vm_size               = "${var.automate_vm_size}"
+  depends_on            = ["azurerm_virtual_machine.automate"]
+
+  storage_image_reference {
+    publisher = "Canonical"
+    offer     = "UbuntuServer"
+    sku       = "16.04-LTS"
+    version   = "latest"
+  }
+
+  storage_os_disk {
+    name              = "automate2_osdisk1"
+    caching           = "ReadWrite"
+    create_option     = "FromImage"
+    managed_disk_type = "Standard_LRS"
+  }
+
+  os_profile {
+    computer_name  = "${var.automate2_server_name}"
+    admin_username = "${var.username}"
+    admin_password = "${var.password}"
+  }
+
+  os_profile_linux_config {
+    disable_password_authentication = false
+  }
+
+  tags {
+    environment = "${var.azure_env}"
+  }
+
+  connection {
+    host     = "${azurerm_public_ip.automate2_pubip.fqdn}"
+    type     = "ssh"
+    user     = "${var.username}"
+    password = "${var.password}"
+  }
+
+  provisioner "file" {
+    source      = "labadmin"
+    destination = "/home/labadmin/.ssh/id_rsa"
+  }
+
+  provisioner "file" {
+    source      = "labadmin.pub"
+    destination = "/home/labadmin/.ssh/authorized_keys"
+  }
+
+  provisioner "file" {
+    source      = "InstallChefAutomate2.sh"
+    destination = "/tmp/InstallChefAutomate2.sh"
+  }
+
+  provisioner "file" {
+    source      = "config.toml"
+    destination = "/tmp/config.toml"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "sudo chmod +x /tmp/InstallChefAutomate2.sh",
+      "sudo /tmp/InstallChefAutomate2.sh ${var.automate_server_name} ${var.chef_server_name} ${var.automate2_server_name}",
+    ]
+  }
+}
+
+# output "aip" {
+#   value = "${azurerm_public_ip.automate_pubip.ip_address}"
+# }
+
+output "a2fqdn" {
+  value = "${azurerm_public_ip.automate2_pubip.fqdn}"
+}

Automate2Server.tf

@@ -20,7 +20,8 @@ resource "azurerm_network_interface" "automate_ip" {
   ip_configuration {
     name                          = "automate_ipconf"
     subnet_id                     = "${azurerm_subnet.subnet.id}"
-    private_ip_address_allocation = "dynamic"
+    private_ip_address_allocation = "static"
+    private_ip_address            = "10.1.1.11"
     public_ip_address_id          = "${azurerm_public_ip.automate_pubip.id}"
   }
 }
@@ -32,6 +33,7 @@ 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"
@@ -59,7 +61,6 @@ resource "azurerm_virtual_machine" "automate" {
 
   tags {
     environment = "${var.azure_env}"
-
   }
 
   connection {
@@ -85,14 +86,24 @@ resource "azurerm_virtual_machine" "automate" {
   }
 
   provisioner "file" {
-    source      = "delivery.license"
-    destination = "/tmp/delivery.license"
+    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 -a ${var.automate_server_name} -c ${var.chef_server_name} -d ${var.chef_server_user} -e ${var.chef_server_org_shortname} -v ${var.automate_server_version} -u ${var.automate_server_user} -p ${var.automate_server_user_password} -z ${var.azure_region}",
+      "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",
     ]
   }
 }
@@ -103,4 +114,4 @@ resource "azurerm_virtual_machine" "automate" {
 
 output "afqdn" {
   value = "${azurerm_public_ip.automate_pubip.fqdn}"
-}
+}

AutomateServer.tf

@@ -1,11 +1,11 @@
 #create a public IP address for the virtual machine
 resource "azurerm_public_ip" "node_pubip" {
-  count = "${var.chef_node_count}"
+  count                        = "${var.chef_node_count}"
   name                         = "node${count.index}_pubip"
   location                     = "${var.azure_region}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
   public_ip_address_allocation = "dynamic"
-  domain_name_label            = "jm-tr-node${count.index}"
+  domain_name_label            = "jm-node${count.index}"
 
   tags {
     environment = "${var.azure_env}"
@@ -14,7 +14,7 @@ resource "azurerm_public_ip" "node_pubip" {
 
 #create the network interface and put it on the proper vlan/subnet
 resource "azurerm_network_interface" "node_ip" {
-  count = "${var.chef_node_count}"
+  count               = "${var.chef_node_count}"
   name                = "node${count.index}_ip"
   location            = "${var.azure_region}"
   resource_group_name = "${azurerm_resource_group.rg.name}"
@@ -23,18 +23,20 @@ resource "azurerm_network_interface" "node_ip" {
     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)}"]
   }
 }
 
 #create the actual VM
 resource "azurerm_virtual_machine" "node" {
-  count = "${var.chef_node_count}"
+  count                 = "${var.chef_node_count}"
   name                  = "node${count.index}"
   location              = "${var.azure_region}"
   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"]
 
   storage_image_reference {
     publisher = "Canonical"
@@ -65,7 +67,7 @@ resource "azurerm_virtual_machine" "node" {
   }
 
   # connection {
-                
+
   #   host     = ["${element(azurerm_public_ip.node.*._pubip.fqdn, count.index)}"]
   #   type     = "ssh"
   #   user     = "${var.username}"
@@ -81,9 +83,9 @@ resource "azurerm_virtual_machine" "node" {
   #   source      = "labadmin.pub"
   #   destination = "/home/labadmin/.ssh/authorized_keys"
   # }
-
 }
 
 # output "node${count.index}fqdn" {
 #   value = ["${element(azurerm_public_ip.node.*._pubip.fqdn, count.index)}"]
-# }
+# }
+

AzureCredentials.tf.template

@@ -18,9 +18,12 @@ resource "azurerm_network_interface" "chef_ip" {
   resource_group_name = "${azurerm_resource_group.rg.name}"
 
   ip_configuration {
-    name                          = "chef_ipconf"
-    subnet_id                     = "${azurerm_subnet.subnet.id}"
-    private_ip_address_allocation = "dynamic"
+    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)}"
     public_ip_address_id          = "${azurerm_public_ip.chef_pubip.id}"
   }
 }
@@ -86,7 +89,7 @@ resource "azurerm_virtual_machine" "chef" {
   provisioner "remote-exec" {
     inline = [
       "sudo chmod +x /tmp/InstallChefServer.sh",
-      "sudo /tmp/InstallChefServer.sh -a ${var.automate_server_name} -z ${var.azure_region} -c ${var.chef_server_name} -v ${var.chef_server_version} -u ${var.chef_server_user} -p ${var.chef_server_user_password} -n ${var.chef_server_user_firstname} -l ${var.chef_server_user_lastname} -e ${var.chef_server_user_email} -s ${var.chef_server_org_shortname} -f ${var.chef_server_org_fullname} -j ${var.chef_server_install_pushjobs} -h ${var.chef_server_pushjobs_version} -m ${var.chef_server_install_manage} -g ${var.chef_server_manage_version} > install.log ",
+      "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 ",
     ]
   }
 }
@@ -97,4 +100,4 @@ resource "azurerm_virtual_machine" "chef" {
 
 output "cfqdn" {
   value = "${azurerm_public_ip.chef_pubip.fqdn}"
-}
+}

ChefNodes.tf

@@ -4,7 +4,7 @@ resource "azurerm_public_ip" "chef2_pubip" {
   location                     = "${var.azure_region}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
   public_ip_address_allocation = "dynamic"
-  domain_name_label            = "jm-tr-chef2"
+  domain_name_label            = "jm-chef2"
 
   tags {
     environment = "${var.azure_env}"
@@ -97,4 +97,4 @@ resource "azurerm_virtual_machine" "chef2" {
 
 output "c2fqdn" {
   value = "${azurerm_public_ip.chef2_pubip.fqdn}"
-}
+}