bug fix

Author: easyawslearn

ebs-with-userdata/instance.tf

@@ -13,10 +13,9 @@ resource "aws_instance" "ebs_instance_example" {
 
   # key name
   key_name = var.key_name
-
+  # User data passing through template rendering
   user_data = data.template_file.init.rendered
 
-
   tags = {
     Name = "EBS with userdata"
   }

ebs-with-userdata/volume.sh

@@ -1,7 +1,17 @@
+<<<<<<< HEAD
 #!/bin/bash -xe
 exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
 sleep 30
 sudo mkdir -p  /data
 sleep 30
 sudo mkfs.ext4 ${device_name}
 sudo mount ${device_name} /data
+=======
+#!/bin/bash -xe
+exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
+sleep 30
+sudo mkdir -p  /data
+sleep 30
+sudo mkfs.ext4 /dev/xvdh
+sudo mount /dev/xvdh /data
+>>>>>>> 59a40dfafde6bc01cab380fc5f663dc7852dee9a

terraform-aws-ec2-userdata/apache_config.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 sudo yum update -y
 sudo yum install -y httpd.x86_64
-sudo yum service httpd start
-sudo yum service httpd enable
-echo "<h1>Deployed via Terraform</h1>" | yum tee /var/www/html/index.html
+sudo service httpd start
+sudo service httpd enable
+echo "<h1>Deployed via Terraform</h1>" | sudo tee /var/www/html/index.html