diff --git a/ansible/ci.yml b/ansible/ci.yml index 022ad658..e3c75f05 100644 --- 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 new file mode 100644 index 00000000..ac048f5e --- /dev/null +++ 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 index 97557c9f..e1b02952 100644 --- 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 index 031a9253..84bcdf2f 100644 --- 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 = < pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy