mount 100GB volume, update /usr/bin/java link (#70)

rodriguezsergio · billoneil · commit 8693bc1665ff · 2018-04-02T20:18:54.000-04:00
* mount 100GB volume, update /usr/bin/java link

* add common role to ci
diff --git a/ansible/ci.yml b/ansible/ci.yml
@@ -13,7 +13,8 @@
          - server_name _
          - return 301 https://jenkins.stubbornjava.com$request_uri
   roles:
-    - galaxy_roles/geerlingguy.java
+    - roles/common
+    - roles/java
     - galaxy_roles/geerlingguy.jenkins
     - galaxy_roles/jdauphant.nginx
     # - galaxy_roles/gantsign.maven
diff --git a/ansible/roles/java/tasks/main.yml b/ansible/roles/java/tasks/main.yml
@@ -0,0 +1,8 @@
+- include_role:
+    name: galaxy_roles/geerlingguy.java
+
+- name: point to correct java version
+  alternatives:
+    name: java
+    link: /usr/bin/java
+    path: /usr/lib/jvm/java-1.8.0-openjdk.x86_64/bin/java
diff --git a/terraform/global.tfvars b/terraform/global.tfvars
@@ -2,4 +2,5 @@ region = "us-east-1"
 
 amis = {
     amazon-linux-2017-09 = "ami-8c1be5f6"
+    amazon-linux-2017-09.1 = "ami-1853ac65"
 }
diff --git a/terraform/stubbornjava.tf b/terraform/stubbornjava.tf
@@ -9,12 +9,31 @@ variable "amis" {
 
 # TODO: import stubbornjava-webapp
 
+resource "aws_volume_attachment" "ebs_jenkins" {
+  device_name = "/dev/sdh"
+  volume_id   = "${aws_ebs_volume.jenkins.id}"
+  instance_id = "${aws_instance.ci.id}"
+
+  skip_destroy = true
+}
+
+resource "aws_ebs_volume" "jenkins" {
+  availability_zone = "us-east-1a"
+  size              = 100
+  type              = "gp2"
+
+  tags {
+      Name = "jenkins"
+      Path = "/var/lib/jenkins"
+  }
+}
+
 resource "aws_instance" "ci" {
   count                       = 1
-  ami                         = "${var.amis["amazon-linux-2017-09"]}"
+  ami                         = "${var.amis["amazon-linux-2017-09.1"]}"
   disable_api_termination     = true
   iam_instance_profile        = "jenkins"
-  instance_type               = "t2.micro"
+  instance_type               = "t2.medium"
   monitoring                  = false
   subnet_id                   = "${element(data.aws_subnet_ids.public.ids, count.index)}"
   key_name                    = "stubbornjava"
@@ -28,7 +47,17 @@ resource "aws_instance" "ci" {
 
   root_block_device {
     volume_type               = "gp2"
-    volume_size               = 20
+    volume_size               = 10
     delete_on_termination     = true
   }
+
+  user_data = <<USER_DATA
+#cloud-config
+bootcmd:
+ - [ cloud-init-per, once, mymkfs, mkfs.ext4, /dev/xvdh ]
+ - [ cloud-init-per, once, createjenkinsdir, mkdir, /var/lib/jenkins ]
+
+mounts:
+ - [ /dev/xvdh, /var/lib/jenkins, "ext4", "defaults,noatime", "0", "0" ]
+USER_DATA
 }

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@ region = "us-east-1"`
`2`	`2`
`3`	`3`	`amis = {`
`4`	`4`	`amazon-linux-2017-09 = "ami-8c1be5f6"`
	`5`	`+ amazon-linux-2017-09.1 = "ami-1853ac65"`
`5`	`6`	`}`