Updated names, trying to fix provisioner.

scarolan · scarolan · commit 74dbea9adf03 · 2018-09-30T19:31:44.000-05:00
diff --git a/terraform/apache.yml b/terraform/apache.yml
diff --git a/terraform/httpd.yml b/terraform/httpd.yml
@@ -0,0 +1,21 @@
+---
+- hosts: webapp
+  sudo: yes
+  tasks:
+    - name: install httpd
+      yum: name=httpd
+    - name: start the httpd service
+      service: name=httpd state=started
+    - name: Configure CatApp
+      shell: |
+        cmd: |
+          cat << EOM > /var/www/html/index.html
+          <html>
+          <head><title>Meow!</title></head>
+          <body style="background-image: linear-gradient(red,orange,yellow,green,blue,indigo,violet);">
+          <center><img src="http://placekitten.com/800/600"></img></center>
+          <marquee><h1>Meow World</h1></marquee>
+          </body>
+          </html>
+          EOM
+          echo "Your kitten is ready."
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -20,7 +20,7 @@ resource "azurerm_subnet" "subnet" {
   address_prefix       = "${var.subnet_prefix}"
 }
 
-resource "azurerm_network_security_group" "tf-guide-sg" {
+resource "azurerm_network_security_group" "tf-ansible-sg" {
   name                = "${var.prefix}-sg"
   location            = "${var.location}"
   resource_group_name = "${azurerm_resource_group.terraform_ansible.name}"
@@ -50,21 +50,21 @@ resource "azurerm_network_security_group" "tf-guide-sg" {
   }
 }
 
-resource "azurerm_network_interface" "tf-guide-nic" {
-  name                      = "${var.prefix}tf-guide-nic"
+resource "azurerm_network_interface" "tf-ansible-nic" {
+  name                      = "${var.prefix}tf-ansible-nic"
   location                  = "${var.location}"
   resource_group_name       = "${azurerm_resource_group.terraform_ansible.name}"
-  network_security_group_id = "${azurerm_network_security_group.tf-guide-sg.id}"
+  network_security_group_id = "${azurerm_network_security_group.tf-ansible-sg.id}"
 
   ip_configuration {
     name                          = "${var.prefix}ipconfig"
     subnet_id                     = "${azurerm_subnet.subnet.id}"
     private_ip_address_allocation = "Dynamic"
-    public_ip_address_id          = "${azurerm_public_ip.tf-guide-pip.id}"
+    public_ip_address_id          = "${azurerm_public_ip.tf-ansible-pip.id}"
   }
 }
 
-resource "azurerm_public_ip" "tf-guide-pip" {
+resource "azurerm_public_ip" "tf-ansible-pip" {
   name                         = "${var.prefix}-ip"
   location                     = "${var.location}"
   resource_group_name          = "${azurerm_resource_group.terraform_ansible.name}"
@@ -78,7 +78,7 @@ resource "azurerm_virtual_machine" "site" {
   resource_group_name = "${azurerm_resource_group.terraform_ansible.name}"
   vm_size             = "${var.vm_size}"
 
-  network_interface_ids         = ["${azurerm_network_interface.tf-guide-nic.id}"]
+  network_interface_ids         = ["${azurerm_network_interface.tf-ansible-nic.id}"]
   delete_os_disk_on_termination = "true"
 
   storage_image_reference {
@@ -109,14 +109,23 @@ resource "azurerm_virtual_machine" "site" {
       }
   }
 
+
+
   # This is to ensure SSH comes up before we run the local exec.
   provisioner "remote-exec" {
     inline = ["echo 'Hello World'"]
+
+    connection {
+      type = "ssh"
+      host = "${azurerm_public_ip.tf-ansible-pip.ip_address}"
+      user = "${var.admin_username}"
+      private_key = "${var.ssh_key}"
+    }
   }
 
 # TODO: have Dylan help with apache.yml playbook
   provisioner "local-exec" {
-    command = "ansible-playbook -i '${self.public_ip},' --private-key ${var.ssh_key} apache.yml"
+    command = "ansible-playbook -i '${azurerm_public_ip.tf-ansible-pip.ip_address},' --private-key ${var.ssh_key} httpd.yml"
   }
 
 }
diff --git a/terraform/outputs.tf b/terraform/outputs.tf
@@ -11,9 +11,9 @@
 # }
 
 # output "public_dns" {
-#   value = "${azurerm_public_ip.tf-guide-pip.fqdn}"
+#   value = "${azurerm_public_ip.tf-ansible-pip.fqdn}"
 # }
 
 # output "App_Server_URL" {
-#   value = "http://${azurerm_public_ip.tf-guide-pip.fqdn}"
+#   value = "http://${azurerm_public_ip.tf-ansible-pip.fqdn}"
 # }
diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -15,7 +15,7 @@ variable "ssh_pubkey" {
 
 variable "resource_group" {
   description = "The name of your Azure Resource Group."
-  default     = "Terraform-Azure-Beginners"
+  default     = "Terraform-Ansible"
 }
 
 variable "prefix" {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ variable "ssh_pubkey" {`
`15`	`15`
`16`	`16`	`variable "resource_group" {`
`17`	`17`	`description = "The name of your Azure Resource Group."`
`18`		`- default = "Terraform-Azure-Beginners"`
	`18`	`+ default = "Terraform-Ansible"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`variable "prefix" {`