Reorganizing repository to adapt it for Terraform Module Registry

cn-terraform · Jan 28, 2019 · bb1183a · bb1183a
1 parent add3314
commit bb1183a
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
-# Jenkins Terraform Module #
+# Jenkins Terraform Module for AWS#
 
 This Terraform module deploys a Jenkins Master Server providing high availability and scalability.
 
-## Amazon Web Services
-
-### Usage
+## Usage
 
 	module "jenkins" {
-	    source = "github.com/jnonino/jenkins-terraform-module//aws?ref=1.0.0"
+	    source = "jnonino/jenkins/aws"
+
         name_preffix        = "${var.name_preffix}"
         profile             = "${var.profile}"
         region              = "${var.region}"
@@ -16,6 +15,10 @@ This Terraform module deploys a Jenkins Master Server providing high availabilit
         private_subnets_ids = [ "${module.networking.private_subnets_ids}" ]
     }
 
-### Output values
+## Output values
 
-* variable: description.
+* jenkins_master_alb_id: Jenkins Master Application Load Balancer ID.
+* jenkins_master_alb_arn: Jenkins Master Application Load Balancer ARN.
+* jenkins_master_alb_arn_suffix: Jenkins Master Application Load Balancer ARN Suffix.
+* jenkins_master_alb_dns_name: Jenkins Master Application Load Balancer DNS Name.
+* jenkins_master_alb_zone_id: Jenkins Master Application Load Balancer Zone ID.
diff --git a/aws/ecs.tf → ecs.tf b/aws/ecs.tf → ecs.tf
diff --git a/aws/files/iam/ecs_autoscale_iam_role.json → files/iam/ecs_autoscale_iam_role.json b/aws/files/iam/ecs_autoscale_iam_role.json → files/iam/ecs_autoscale_iam_role.json
diff --git a/...es/iam/ecs_autoscale_iam_role_policy.json → files/iam/ecs_autoscale_iam_role_policy.json b/...es/iam/ecs_autoscale_iam_role_policy.json → files/iam/ecs_autoscale_iam_role_policy.json
diff --git a/...iles/iam/ecs_task_execution_iam_role.json → files/iam/ecs_task_execution_iam_role.json b/...iles/iam/ecs_task_execution_iam_role.json → files/iam/ecs_task_execution_iam_role.json
diff --git a/...tions/jenkins_master_task_definition.json → ...tions/jenkins_master_task_definition.json b/...tions/jenkins_master_task_definition.json → ...tions/jenkins_master_task_definition.json
diff --git a/aws/iam.tf → iam.tf b/aws/iam.tf → iam.tf
diff --git a/aws/jenkins-master.tf → jenkins-master.tf b/aws/jenkins-master.tf → jenkins-master.tf
@@ -1,15 +1,3 @@
-# ---------------------------------------------------------------------------------------------------------------------
-# Variables
-# ---------------------------------------------------------------------------------------------------------------------
-locals {
-    jenkins_master_container_name      = "jenkins_master"
-    jenkins_master_cloudwatch_log_path = "/ecs/service/${var.name_preffix}-jenkins-master"
-    jenkins_container_web_port         = 8080
-    jenkins_container_slave_port       = 50000
-    jenkins_fargate_cpu_value          = 2048 # 2 vCPU  - https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
-    jenkins_fargate_memory_value       = 4096 # 4 GB    - https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # AWS Cloudwatch
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/main.tf b/main.tf
@@ -0,0 +1,11 @@
+# ---------------------------------------------------------------------------------------------------------------------
+# Variables
+# ---------------------------------------------------------------------------------------------------------------------
+locals {
+    jenkins_master_container_name      = "jenkins_master"
+    jenkins_master_cloudwatch_log_path = "/ecs/service/${var.name_preffix}-jenkins-master"
+    jenkins_container_web_port         = 8080
+    jenkins_container_slave_port       = 50000
+    jenkins_fargate_cpu_value          = 2048 # 2 vCPU  - https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
+    jenkins_fargate_memory_value       = 4096 # 4 GB    - https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
+}
diff --git a/aws/outputs.tf → outputs.tf b/aws/outputs.tf → outputs.tf
@@ -2,17 +2,22 @@
 # Jenkins Master ALB DNS
 # ---------------------------------------------------------------------------------------------------------------------
 output "jenkins_master_alb_id" {
+  description = "Jenkins Master Application Load Balancer ID"
   value = "${aws_alb.jenkins_master_alb.id}"
 }
 output "jenkins_master_alb_arn" {
+  description = "Jenkins Master Application Load Balancer ARN"
   value = "${aws_alb.jenkins_master_alb.arn}"
 }
 output "jenkins_master_alb_arn_suffix" {
+  description = "Jenkins Master Application Load Balancer ARN Suffix"
   value = "${aws_alb.jenkins_master_alb.arn_suffix}"
 }
 output "jenkins_master_alb_dns_name" {
+  description = "Jenkins Master Application Load Balancer DNS Name"
   value = "${aws_alb.jenkins_master_alb.dns_name}"
 }
 output "jenkins_master_alb_zone_id" {
+  description = "Jenkins Master Application Load Balancer Zone ID"
   value = "${aws_alb.jenkins_master_alb.zone_id}"
 }
diff --git a/aws/provider.tf → provider.tf b/aws/provider.tf → provider.tf
diff --git a/aws/security.tf → security.tf b/aws/security.tf → security.tf
diff --git a/aws/terraform.tfvars → terraform.tfvars b/aws/terraform.tfvars → terraform.tfvars
diff --git a/aws/variables.tf → variables.tf b/aws/variables.tf → variables.tf
@@ -22,10 +22,10 @@ variable "vpc_id" {
     description = "ID of the VPC"
 }
 variable "public_subnets_ids" {
-    type        = "list"
     description = "List of Public Subnets IDs"
+    type        = "list"
 }
 variable "private_subnets_ids" {
-    type        = "list"
     description = "List of Private Subnets IDs"
+    type        = "list"
 }