Merge branch 'master' of https://github.com/thaumos/ansible-terraform into thaumos-master

scarolan · scarolan · commit 1e0c70447464 · 2018-10-02T22:33:49.000-05:00
diff --git a/ansible/httpd.yml b/ansible/httpd.yml
@@ -1,15 +1,29 @@
 ---
-- hosts: all
+- hosts: http
   become: yes
   become_user: root
+
+  vars:
+    helloworld: Meow!
+
   tasks:
     - name: Install firewalld
       yum: name=firewalld
     - name: Stop firewalld
-      service: name=firewalld state=stopped
+      service: 
+        name: firewalld 
+        state: stopped
+
     - name: Install the httpd package
-      yum: name=httpd
+      yum: 
+        name: httpd
+
     - name: Start the httpd service
-      service: name=httpd state=started
+      service: 
+        name: httpd 
+        state: started
+        
     - name: Configure Cat App
-      script: ../files/webapp.sh
+      template:
+        src: ../files/index.j2
+        dest: /var/www/html/index.html
diff --git a/ansible/inventory.yaml b/ansible/inventory.yaml
@@ -0,0 +1,5 @@
+http:
+  hosts:
+    ec2-13-57-34-111.us-west-1.compute.amazonaws.com:
+  vars:
+    ansible_ssh_user: centos
diff --git a/files/index.j2 b/files/index.j2
@@ -1,13 +1,7 @@
-#!/bin/sh
-
-cat << EOM > /var/www/html/index.html
 <html>
-  <head><title>Meow!</title></head>
+  <head><title>{{ helloworld }}</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 demo is now ready."
+</html>
diff --git a/terraform_azure/main.tf b/terraform_azure/main.tf
@@ -122,7 +122,7 @@ resource "azurerm_virtual_machine" "site" {
   }
 
   provisioner "local-exec" {
-    command = "ansible-playbook -i '${azurerm_public_ip.tf-ansible-pip.fqdn},' --private-key ${var.ssh_key_path} ../ansible/httpd.yml"
+    command = "ansible-playbook -i ../ansible/inventory.yaml --private-key ${var.ssh_key_path} ../ansible/httpd.yml"
   }
 
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +http:
 +  hosts:
 +    ec2-13-57-34-111.us-west-1.compute.amazonaws.com:
 +  vars:
 +    ansible_ssh_user: centos
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ resource "azurerm_virtual_machine" "site" {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`provisioner "local-exec" {`
`125`		`- command = "ansible-playbook -i '${azurerm_public_ip.tf-ansible-pip.fqdn},' --private-key ${var.ssh_key_path} ../ansible/httpd.yml"`
	`125`	`+ command = "ansible-playbook -i ../ansible/inventory.yaml --private-key ${var.ssh_key_path} ../ansible/httpd.yml"`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`}`