Updated certificate server module for standardization

Author: blakeneyops

CHANGELOG.md

@@ -11,11 +11,13 @@
 
 #### BREAKING CHANGES:
 - Updates in resource naming will cause churn for existing resources.
+- Updated certificate generator to require VPC deployment
 
 #### IMPROVEMENTS:
 - Standardization with other Unif.io OSS terraform modules
 - Documentation improvements
 - Updated security group scheme for OpenVPN server
+- Added pre-built AMI lookup to the server module
 
 ## 0.0.5
 

Rakefile

@@ -4,15 +4,13 @@ inputs = {
   'stack_item_label'    => 'expl-tst',
   'stack_item_fullname' => 'Example Stack',
   'vpc_id'              => 'vpc-xxxxxx',
-  'region'              => 'us-west-2',
+  'region'              => 'us-east-1',
   'subnets'             => 'subnet-111111,subnet-222222',
-  'ami'                 => 'ami-xxxxxx',
   'instance_type'       => 't2.small',
   'key_name'            => 'example',
   'route_cidrs'         => '10.10.0.0/25,10.10.0.128/25,10.10.4.0/25,10.10.4.128/25',
   's3_bucket'           => 'openvpn-certs',
   's3_bucket_prefix'    => '20160603',
-  'cidr_whitelist'      => '0.0.0.0/0'
 }
 
 task :default => :verify

certs/main.tf

@@ -213,7 +213,7 @@ module "cluster" {
   region  = "${var.region}"
 
   # LC parameters
-  ami              = "${var.ami}"
+  ami              = "${coalesce(lookup(var.ami_region_lookup, var.region), var.ami_custom)}"
   instance_type    = "${var.instance_type}"
   instance_profile = "${aws_iam_instance_profile.profile.id}"
   user_data        = "${template_file.user_data.rendered}"

certs/outputs.tf

@@ -7,3 +7,11 @@ output "vpn_server_sg_id" {
 output "vpn_whitelist" {
   value = "${var.vpn_whitelist}"
 }
+
+output "vpn_elb_dns_name" {
+  value = "${aws_elb.elb.dns_name}"
+}
+
+output "vpn_elb_zone_id" {
+  value = "${aws_elb.elb.zone_id}"
+}

certs/variables.tf

@@ -28,9 +28,21 @@ variable "subnets" {
 }
 
 ## OpenVPN parameters
-variable "ami" {
+variable "ami_custom" {
   type        = "string"
-  description = "Amazon Machine Image (AMI) to associate with the launch configuration."
+  description = "Custom AMI to utilize"
+  default     = ""
+}
+
+variable "ami_region_lookup" {
+  # Not meant to be overwritten
+  type = "map"
+
+  default = {
+    us-east-1      = "ami-d66995bb"
+    ap-northeast-1 = "ami-4803ec29"
+    custom         = ""
+  }
 }
 
 variable "instance_type" {

examples/openvpn/main.tf

@@ -19,11 +19,9 @@ module "openvpn_server" {
   subnets = "${var.subnets}"
 
   ## OpenVPN parameters
-  ami              = "${var.ami}"
   instance_type    = "${var.instance_type}"
   key_name         = "${var.key_name}"
   route_cidrs      = "${var.route_cidrs}"
   s3_bucket        = "${var.s3_bucket}"
   s3_bucket_prefix = "${var.s3_bucket_prefix}"
-  cidr_whitelist   = "${var.cidr_whitelist}"
 }

examples/openvpn/variables.tf

@@ -23,10 +23,6 @@ variable "subnets" {
 }
 
 ## OpenVPN parameters
-variable "ami" {
-  type = "string"
-}
-
 variable "instance_type" {
   type = "string"
 }
@@ -46,7 +42,3 @@ variable "s3_bucket" {
 variable "s3_bucket_prefix" {
   type = "string"
 }
-
-variable "cidr_whitelist" {
-  type = "string"
-}